diff --git a/DroidFishApp/src/main/java/org/petero/droidfish/view/MoveListView.java b/DroidFishApp/src/main/java/org/petero/droidfish/view/MoveListView.java
index 28f5a14..ad46609 100644
--- a/DroidFishApp/src/main/java/org/petero/droidfish/view/MoveListView.java
+++ b/DroidFishApp/src/main/java/org/petero/droidfish/view/MoveListView.java
@@ -139,12 +139,13 @@ public class MoveListView extends View {
 
         int height = 0;
         if (layout != null) {
-            height = layout.getLineCount() * getLineHeight();
+            int nLines = layout.getLineCount();
+            height = nLines * getLineHeight();
             ViewParent p = getParent();
             if (p != null)
                 p = p.getParent();
             if (p instanceof MyRelativeLayout)
-                height += -getLineHeight() + ((MyRelativeLayout)p).getNewHeight();
+                height = getLineStartY(nLines - 1) + ((MyRelativeLayout)p).getNewHeight();
         }
         switch (MeasureSpec.getMode(heightMeasureSpec)) {
         case MeasureSpec.UNSPECIFIED:
diff --git a/DroidFishApp/src/main/res/layout/main.xml b/DroidFishApp/src/main/res/layout/main.xml
index 1931d73..3c22d13 100644
--- a/DroidFishApp/src/main/res/layout/main.xml
+++ b/DroidFishApp/src/main/res/layout/main.xml
@@ -42,7 +42,8 @@
                 android:id="@+id/buttons"
                 android:orientation="horizontal"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="4dp">
 
                 <ImageButton
                     android:id="@+id/custom3Button"
@@ -91,8 +92,7 @@
             <ScrollView
                 android:id="@+id/scrollView"
                 android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_marginTop="4dp">
+                android:layout_height="fill_parent">
 
                 <view
                     class="org.petero.droidfish.view.MoveListView"