diff --git a/astrid/res/layout/welcome_walkthrough_login_page.xml b/astrid/res/layout/welcome_walkthrough_login_page.xml
index 5eee9e866..c98b38262 100644
--- a/astrid/res/layout/welcome_walkthrough_login_page.xml
+++ b/astrid/res/layout/welcome_walkthrough_login_page.xml
@@ -21,7 +21,7 @@
       android:textStyle="bold"
       android:shadowRadius="2"
       android:shadowDy="1"
-      android:shadowColor="@android:color/white" />
+      android:shadowColor="@android:color/white"/>
     
     <TextView
       android:id="@+id/error"
@@ -38,34 +38,34 @@
 	    android:paddingTop="5dip" >
 	
 	    <TextView
-	      android:id="@+id/login_later"
+	      android:id="@+id/tos"
 	      android:layout_width="fill_parent"
-	      android:layout_height="45dip"
+	      android:layout_height="35dip"
+	      android:layout_alignParentTop="true"
 	      android:gravity="center"
-	      android:layout_alignParentBottom="true"
 	      android:paddingLeft="20dip"
 	      android:paddingRight="20dip"
-	      android:paddingBottom="5dip"
-	      android:textSize="16sp"
-	      android:textColor="#444444" />
-	  
+	      android:textSize="12.5sp"
+	      android:textColor="#444444" />   
+
 	    <Button
-	      android:id="@+id/pw_login"
+	      android:id="@+id/gg_login"
 	      android:layout_width="fill_parent"
 	      android:layout_height="45dip"
-	      android:layout_above="@id/login_later"
+	      android:layout_below="@id/tos"
 	      android:paddingLeft="20dip"
-          android:paddingRight="20dip"
+	      android:paddingRight="20dip"
           android:layout_marginLeft="15dip"
           android:layout_marginRight="15dip"
-	      android:textSize="16sp" 
-	      android:text="@string/welcome_login_pw"/>    
-	  
+	      android:textSize="16sp"
+	      android:drawableLeft="@drawable/google"
+	      android:text="@string/actfm_ALA_gg_login" />
+	    
 	    <com.facebook.android.LoginButton
 	      android:id="@+id/fb_login"
 	      android:layout_width="fill_parent"
 	      android:layout_height="45dip"
-	      android:layout_above="@id/pw_login"
+	      android:layout_below="@id/gg_login"
 	      android:paddingLeft="20dip"
 	      android:paddingRight="20dip"
           android:layout_marginLeft="15dip"
@@ -73,29 +73,30 @@
 	      android:textSize="16sp"
 	      android:drawableLeft="@drawable/facebook"
 	      android:text="@string/actfm_ALA_fb_login" />
-	                        
+	    
 	    <Button
-	      android:id="@+id/gg_login"
+	      android:id="@+id/pw_login"
 	      android:layout_width="fill_parent"
 	      android:layout_height="45dip"
-	      android:layout_above="@id/fb_login"
+	      android:layout_below="@id/fb_login"
 	      android:paddingLeft="20dip"
-	      android:paddingRight="20dip"
+          android:paddingRight="20dip"
           android:layout_marginLeft="15dip"
           android:layout_marginRight="15dip"
-	      android:textSize="16sp"
-	      android:drawableLeft="@drawable/google"
-	      android:text="@string/actfm_ALA_gg_login" />
-	      
+	      android:textSize="16sp" 
+	      android:text="@string/welcome_login_pw"/>    
+	    
 	    <TextView
-	      android:id="@+id/tos"
+	      android:id="@+id/login_later"
 	      android:layout_width="fill_parent"
-	      android:layout_height="35dip"
-	      android:layout_above="@id/gg_login"
+	      android:layout_height="45dip"
 	      android:gravity="center"
+	      android:layout_below="@id/pw_login"
 	      android:paddingLeft="20dip"
 	      android:paddingRight="20dip"
-	      android:textSize="12.5sp"
-	      android:textColor="#444444" />   
+	      android:paddingBottom="5dip"
+	      android:textSize="16sp"
+	      android:textColor="#444444" />
+	      
   </RelativeLayout>
 </LinearLayout>
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
similarity index 96%
rename from astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java
rename to astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
index 28fef98fe..888d4d106 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/ViewPagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
@@ -18,7 +18,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.viewpagerindicator.TitleProvider;
 
-public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
+public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
 {
     private static int[] images = new int[] {
         R.drawable.welcome_walkthrough_1,
@@ -57,7 +57,7 @@ public class ViewPagerAdapter extends PagerAdapter implements TitleProvider
     public WelcomeWalkthrough parent;
     @Autowired ActFmPreferenceService actFmPreferenceService;
 
-    public ViewPagerAdapter(Context context, boolean manual) {
+    public WelcomePagerAdapter(Context context, boolean manual) {
         this.context = context;
         DependencyInjectionService.getInstance().inject(this);
 
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index 7593ed5ac..3acd33de2 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -23,7 +23,7 @@ import com.viewpagerindicator.PageIndicator;
 
 public class WelcomeWalkthrough extends ActFmLoginActivity {
     private ViewPager mPager;
-    private ViewPagerAdapter mAdapter;
+    private WelcomePagerAdapter mAdapter;
     private PageIndicator mIndicator;
     private View currentView;
     private int currentPage;
@@ -37,7 +37,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
 
-        mAdapter = new ViewPagerAdapter(this, getIntent().hasExtra(TOKEN_MANUAL_SHOW));
+        mAdapter = new WelcomePagerAdapter(this, getIntent().hasExtra(TOKEN_MANUAL_SHOW));
         mAdapter.parent = this;
 
         mPager = (ViewPager)findViewById(R.id.pager);