diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
index 77cf81183..5559f750e 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java
@@ -1,13 +1,10 @@
 package fr.free.nrw.commons.upload;
 
 import android.Manifest;
-import android.animation.LayoutTransition;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
-import android.support.constraint.ConstraintLayout;
 import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.CardView;
@@ -27,6 +24,7 @@ import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
+import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -49,14 +47,15 @@ import butterknife.ButterKnife;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.Utils;
-import fr.free.nrw.commons.auth.AuthenticatedActivity;
 import fr.free.nrw.commons.auth.LoginActivity;
+import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.category.CategoriesModel;
 import fr.free.nrw.commons.category.CategoryItem;
 import fr.free.nrw.commons.contributions.Contribution;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.mwapi.MediaWikiApi;
 import fr.free.nrw.commons.nearby.Place;
+import fr.free.nrw.commons.theme.BaseActivity;
 import fr.free.nrw.commons.utils.DialogUtil;
 import fr.free.nrw.commons.utils.NetworkUtils;
 import fr.free.nrw.commons.utils.PermissionUtils;
@@ -72,17 +71,17 @@ import static fr.free.nrw.commons.utils.ImageUtils.Result;
 import static fr.free.nrw.commons.utils.ImageUtils.getErrorMessageForResult;
 import static fr.free.nrw.commons.wikidata.WikidataConstants.PLACE_OBJECT;
 
-public class UploadActivity extends AuthenticatedActivity implements UploadView, SimilarImageInterface {
+public class UploadActivity extends BaseActivity implements UploadView, SimilarImageInterface {
     @Inject MediaWikiApi mwApi;
-    @Inject
-    @Named("direct_nearby_upload_prefs")
-    JsonKvStore directKvStore;
+    @Inject @Named("direct_nearby_upload_prefs") JsonKvStore directKvStore;
     @Inject UploadPresenter presenter;
     @Inject CategoriesModel categoriesModel;
+    @Inject SessionManager sessionManager;
 
     // Main GUI
     @BindView(R.id.backgroundImage) PhotoView background;
-    @BindView(R.id.activity_upload_cards) ConstraintLayout cardLayout;
+    @BindView(R.id.upload_root_layout)
+    RelativeLayout rootLayout;
     @BindView(R.id.view_flipper) ViewFlipper viewFlipper;
 
     // Top Card
@@ -426,12 +425,6 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
         updateCategoryList("");
     }
 
-    @Override
-    protected void onAuthCookieAcquired(String authCookie) {
-        mwApi.setAuthCookie(authCookie);
-    }
-
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -440,13 +433,6 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
         }
     }
 
-
-    @Override
-    protected void onAuthFailure() {
-        Toast.makeText(this, R.string.authentication_failed, Toast.LENGTH_LONG).show();
-        finish();
-    }
-
     /**
      * Parses links from HTML string, and makes the links clickable in the specified TextView.<br>
      * Uses {@link #makeLinkClickable(SpannableStringBuilder, URLSpan)}.
@@ -504,9 +490,6 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
     }
 
     private void configureLayout() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            cardLayout.getLayoutTransition().enableTransitionType(LayoutTransition.CHANGING);
-        }
         background.setScaleType(ImageView.ScaleType.CENTER_CROP);
         background.setOnScaleChangeListener((scaleFactor, x, y) -> presenter.closeAllCards());
     }
@@ -536,7 +519,7 @@ public class UploadActivity extends AuthenticatedActivity implements UploadView,
         // Navigation next / previous for each image as we're collecting title + description
         next.setOnClickListener(v -> {
             if (!NetworkUtils.isInternetConnectionEstablished(this)) {
-                ViewUtil.showShortSnackbar(cardLayout, R.string.no_internet);
+                ViewUtil.showShortSnackbar(rootLayout, R.string.no_internet);
                 return;
             }
             setTitleAndDescriptions();
diff --git a/app/src/main/res/layout/activity_upload.xml b/app/src/main/res/layout/activity_upload.xml
index 9e29ee285..3987a53d3 100644
--- a/app/src/main/res/layout/activity_upload.xml
+++ b/app/src/main/res/layout/activity_upload.xml
@@ -1,69 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/upload_root_layout"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <RelativeLayout
+    <com.github.chrisbanes.photoview.PhotoView
+        android:id="@+id/backgroundImage"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_below="@id/toolbar"
+        android:background="@color/commons_app_blue_dark"
+        app:actualImageScaleType="fitCenter" />
+
+    <ViewFlipper
+        android:id="@+id/view_flipper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:clipChildren="false"
+        android:measureAllChildren="false">
 
         <include
-            android:id="@+id/toolbar"
-            layout="@layout/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone" />
+            layout="@layout/activity_upload_bottom_card"
+            android:visibility="visible" />
 
-        <com.github.chrisbanes.photoview.PhotoView
-            android:id="@+id/backgroundImage"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:background="@color/commons_app_blue_dark"
-            app:actualImageScaleType="fitCenter" />
+        <include layout="@layout/activity_upload_categories" />
 
-        <android.support.constraint.ConstraintLayout
-            android:id="@+id/activity_upload_cards"
-            android:animateLayoutChanges="true"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_below="@id/toolbar"
-            android:gravity="bottom">
+        <include layout="@layout/activity_upload_license" />
 
+        <include layout="@layout/activity_upload_please_wait" />
 
-            <ViewFlipper
-                android:id="@+id/view_flipper"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:clipChildren="false"
-                android:measureAllChildren="false"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent">
-
-                <include
-                    layout="@layout/activity_upload_bottom_card"
-                    android:visibility="visible" />
-
-                <include layout="@layout/activity_upload_categories" />
-
-                <include layout="@layout/activity_upload_license" />
-
-                <include layout="@layout/activity_upload_please_wait" />
-
-            </ViewFlipper>
-        </android.support.constraint.ConstraintLayout>
-
-    </RelativeLayout>
-
-    <android.support.design.widget.NavigationView
-        android:id="@+id/navigation_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:headerLayout="@layout/drawer_header"
-        app:menu="@menu/drawer" />
-
-</android.support.v4.widget.DrawerLayout>
+    </ViewFlipper>
+</RelativeLayout>
\ No newline at end of file