diff --git a/src/angular-app/languageforge/lexicon/editor/_editor.scss b/src/angular-app/languageforge/lexicon/editor/_editor.scss
index 8c274e8c83..0c5a11f3c8 100644
--- a/src/angular-app/languageforge/lexicon/editor/_editor.scss
+++ b/src/angular-app/languageforge/lexicon/editor/_editor.scss
@@ -6,7 +6,7 @@
 
 .lexAppToolbar {
     border: 1px solid $line-color;
-    margin: 10px 0 20px;
+    margin: 0 0 5px;
     padding: 4px;
     width: 100%;
     float: left;
diff --git a/src/angular-app/languageforge/lexicon/editor/comment/lex-comments-view.scss b/src/angular-app/languageforge/lexicon/editor/comment/lex-comments-view.scss
index 1d2c6f5d2c..79d6eda934 100644
--- a/src/angular-app/languageforge/lexicon/editor/comment/lex-comments-view.scss
+++ b/src/angular-app/languageforge/lexicon/editor/comment/lex-comments-view.scss
@@ -18,8 +18,14 @@
 .container-scroll {
   overflow-y: scroll;
   overflow-x: hidden;
-  height: calc(100vh - 296px);
+
+  @include media-breakpoint-up(sm) {
+    height: calc(100vh - 296px);
+  }
+  @include media-breakpoint-down(sm) {
+    height: calc(100vh - 270px);
   }
+}
 
 .comments-right-panel {
   color: $Eden;
diff --git a/src/angular-app/languageforge/lexicon/editor/field/_dc-rendered.scss b/src/angular-app/languageforge/lexicon/editor/field/_dc-rendered.scss
index 986da37d52..db52da7ae5 100644
--- a/src/angular-app/languageforge/lexicon/editor/field/_dc-rendered.scss
+++ b/src/angular-app/languageforge/lexicon/editor/field/_dc-rendered.scss
@@ -26,10 +26,8 @@
   }
 }
 .dc-rendered-overflow{
-  @include media-breakpoint-down(sm) {
-   display: -webkit-box;
-   -webkit-line-clamp: 3;
-   -webkit-box-orient: vertical; 
-   overflow: hidden; 
-  }
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
 }
diff --git a/src/angular-app/languageforge/lexicon/shared/fit-text.directive.ts b/src/angular-app/languageforge/lexicon/shared/fit-text.directive.ts
index 35a202d68c..ce1f7a36a1 100644
--- a/src/angular-app/languageforge/lexicon/shared/fit-text.directive.ts
+++ b/src/angular-app/languageforge/lexicon/shared/fit-text.directive.ts
@@ -3,52 +3,34 @@ import * as angular from 'angular';
 export class FitTextDirective implements angular.IDirective {
 
   link(scope: angular.IScope, element: angular.IAugmentedJQuery, attr: angular.IAttributes) {
-    let kInput: boolean = false;
-    var defaultHeight = 24;
-    element.height(40);
-    element.css({ 'max-height': '40px' });
-    element.css({ height: '40px' });
-
-    function updateHeight(): any {
-      let height = element.prop('scrollHeight');
-      element.height = height;
-      element.css({ 'max-height': height + 'px' });
-      element.css({ height: height + 'px' });
-      updateContainersHeight();
-    }
+    function updateHeight(): void {
+
+        // element is a JQuery object, and element[0] is the textarea DOM object
+        // the DOM object is the only way we can access the calculated "scrollHeight",
+        // since the JQuery object doesn't have that property
+        let el = element[0] as HTMLTextAreaElement;
+
+        // start with a small minimum height
+      	el.style.height = "10px";
 
-    function updateContainersHeight(): any {
-      var wHeight = angular.element(window).height();
-      var editorTitleTextElement = angular.element(document).find('#editor-title-text');
-      var tHeight = editorTitleTextElement.height();
-      var primaryNavigationElement = angular.element(document).find('#primary-navigation');
-      var primaryNavigationHeight = primaryNavigationElement.height();
-      var scrollingEditorContainerElement = angular.element(document).find('#scrolling-editor-container');
-
-      var adjHeight = wHeight - (tHeight - defaultHeight);
-      var sHeight = adjHeight - (177 + primaryNavigationHeight);
-      var lHeight = adjHeight - (447 + primaryNavigationHeight);
-      scrollingEditorContainerElement.css({ height: sHeight + 'px' });
+        // grow to the height necessary to fit all the text
+        el.style.height = el.scrollHeight+"px";
     }
 
     element.on('keyup', () => {
-      kInput = true;
       scope.$apply(() => {
         updateHeight();
       });
     });
 
-    angular.element(window).on('resize',() => { 
+    angular.element(window).on('resize',() => {
       updateHeight();
     });
 
+    // this is required in order to resize the text area when switching between entries
     scope.$watch(() => {
-      if (!kInput){
-        kInput = false;
-        updateHeight();
-      }
+      updateHeight();
     });
-
   }
 
   static factory(): angular.IDirectiveFactory {