diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index 1e590fed0..063624771 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -78,6 +78,7 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.Eula;
 import com.todoroo.astrid.gtasks.auth.ModernAuthManager;
 import com.todoroo.astrid.service.AstridDependencyInjector;
+import com.todoroo.astrid.service.MarketStrategy.AmazonMarketStrategy;
 import com.todoroo.astrid.service.StatisticsConstants;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.SyncV2Service;
@@ -238,7 +239,10 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
         loginButton.init(this, facebook, this, new String[] { "email",
                 "offline_access", "publish_stream" });
 
-        findViewById(R.id.gg_login).setOnClickListener(googleListener);
+        View googleLogin = findViewById(R.id.gg_login);
+        if(AmazonMarketStrategy.isKindleFire())
+            googleLogin.setVisibility(View.GONE);
+        googleLogin.setOnClickListener(googleListener);
         Button pwLogin = (Button) findViewById(R.id.pw_login);
         pwLogin.setOnClickListener(signUpListener);
         setupTermsOfService((TextView) findViewById(R.id.tos));
diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml
index c1a21485f..f3754f086 100644
--- a/astrid/res/layout/tag_updates_fragment.xml
+++ b/astrid/res/layout/tag_updates_fragment.xml
@@ -6,14 +6,15 @@
     android:layout_height="fill_parent"
     android:orientation="vertical" >
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/no_activity_container"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
         android:layout_weight="100"
         android:orientation="vertical"
-            android:layout_gravity="center"
+        android:layout_gravity="center"
         android:visibility="gone">
+        
         <ImageView
             android:id="@+id/no_activity_image"
             android:layout_width="fill_parent"
@@ -26,11 +27,10 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_below="@id/no_activity_image"
             android:textSize="20dip"
             android:gravity="center"
             style="@style/TextAppearance" />
-    </RelativeLayout>
+    </LinearLayout>
 
     <ListView
         android:id="@android:id/list"