diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index ba740f68..8760198d 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -83,13 +83,14 @@ public abstract class BaseActivity extends AppCompatActivity
     //TODO: move stuff below (?)
     //------------------------------------------DRAWER STUFF----------------------------------------
     protected static final int HOME_ID=0;
-    protected static final int LOG_ID =1;
-    protected static final int ABOUT_ID=2;
+    protected static final int DOWNLOADS_ID=1;
+    protected static final int LOG_ID =2;
+    protected static final int ABOUT_ID=3;
 
     private AccountHeader accountHeader;
     private ProfileDrawerItem profileDrawerItem;
-    private PrimaryDrawerItem homeItem, loginLogoutItem, aboutItem;
-    private IconicsDrawable homeIcon, homeIconSelected, loginIcon, logoutIcon,
+    private PrimaryDrawerItem homeItem, downloadsItem, loginLogoutItem, aboutItem;
+    private IconicsDrawable homeIcon, homeIconSelected, downloadsIcon, downloadsIconSelected, loginIcon, logoutIcon,
             aboutIcon, aboutIconSelected;
 
     /**
@@ -110,6 +111,14 @@ public abstract class BaseActivity extends AppCompatActivity
                 .icon(FontAwesome.Icon.faw_home)
                 .color(selectedSecondaryColor);
 
+        downloadsIcon =new IconicsDrawable(this)
+                .icon(FontAwesome.Icon.faw_download)
+                .color(primaryColor);
+
+        downloadsIconSelected =new IconicsDrawable(this)
+                .icon(FontAwesome.Icon.faw_download)
+                .color(selectedSecondaryColor);
+
         loginIcon =new IconicsDrawable(this)
                 .icon(FontAwesome.Icon.faw_sign_in)
                 .color(primaryColor);
@@ -136,21 +145,34 @@ public abstract class BaseActivity extends AppCompatActivity
                 .withIcon(homeIcon)
                 .withSelectedIcon(homeIconSelected);
 
-        if (!sessionManager.isLoggedIn()) //When logged out
+
+
+        if (sessionManager.isLoggedIn()) //When logged in
+        {
             loginLogoutItem = new PrimaryDrawerItem()
                     .withTextColor(primaryColor)
                     .withSelectedColor(selectedSecondaryColor)
-                    .withIdentifier(LOG_ID).withName(R.string.login)
-                    .withIcon(loginIcon)
+                    .withIdentifier(LOG_ID)
+                    .withName(R.string.logout)
+                    .withIcon(logoutIcon)
                     .withSelectable(false);
+            downloadsItem = new PrimaryDrawerItem()
+                    .withTextColor(primaryColor)
+                    .withSelectedColor(selectedPrimaryColor)
+                    .withSelectedTextColor(selectedSecondaryColor)
+                    .withIdentifier(DOWNLOADS_ID)
+                    .withName(R.string.downloads)
+                    .withIcon(downloadsIcon)
+                    .withSelectedIcon(downloadsIconSelected);
+        }
         else
             loginLogoutItem = new PrimaryDrawerItem()
                     .withTextColor(primaryColor)
                     .withSelectedColor(selectedSecondaryColor)
-                    .withIdentifier(LOG_ID)
-                    .withName(R.string.logout)
-                    .withIcon(logoutIcon)
+                    .withIdentifier(LOG_ID).withName(R.string.login)
+                    .withIcon(loginIcon)
                     .withSelectable(false);
+
         aboutItem = new PrimaryDrawerItem()
                 .withTextColor(primaryColor)
                 .withSelectedColor(selectedPrimaryColor)
@@ -195,13 +217,12 @@ public abstract class BaseActivity extends AppCompatActivity
                 .build();
 
         //Drawer
-        drawer = new DrawerBuilder()
+        DrawerBuilder drawerBuilder = new DrawerBuilder()
                 .withActivity(this)
                 .withToolbar(toolbar)
                 .withDrawerWidthDp((int)BaseApplication.getInstance().getDpWidth()/2)
                 .withSliderBackgroundColor(ContextCompat.getColor(this, R.color.primary_light))
                 .withAccountHeader(accountHeader)
-                .addDrawerItems(homeItem,loginLogoutItem,aboutItem)
                 .withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() {
                     @Override
                     public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
@@ -213,6 +234,14 @@ public abstract class BaseActivity extends AppCompatActivity
                                 startActivity(i);
                             }
                         }
+//                        else if(drawerItem.equals(DOWNLOADS_ID))
+//                        {
+//                            if (sessionManager.isLoggedIn()) //When logged out or if user is guest
+//                            {
+//                                Intent i = new Intent(BaseActivity.this, DownloadsActivity.class);
+//                                startActivity(i);
+//                            }
+//                        }
                         else if(drawerItem.equals(LOG_ID))
                         {
                             if (!sessionManager.isLoggedIn()) //When logged out or if user is guest
@@ -238,8 +267,14 @@ public abstract class BaseActivity extends AppCompatActivity
                         drawer.closeDrawer();
                         return true;
                     }
-                })
-                .build();
+                });
+
+        if(sessionManager.isLoggedIn())
+            drawerBuilder.addDrawerItems(homeItem,downloadsItem,loginLogoutItem,aboutItem);
+        else
+            drawerBuilder.addDrawerItems(homeItem,loginLogoutItem,aboutItem);
+
+        drawer = drawerBuilder.build();
 
         drawer.getActionBarDrawerToggle().setDrawerIndicatorEnabled(false);
         drawer.setOnDrawerNavigationListener(new Drawer.OnDrawerNavigationListener() {
@@ -257,6 +292,7 @@ public abstract class BaseActivity extends AppCompatActivity
         {
             if (!sessionManager.isLoggedIn()) //When logged out or if user is guest
             {
+                drawer.removeItem(DOWNLOADS_ID);
                 loginLogoutItem.withName(R.string.login).withIcon(loginIcon); //Swap logout with login
                 profileDrawerItem.withName(sessionManager.getUsername()).withIcon(new IconicsDrawable(this)
                         .icon(FontAwesome.Icon.faw_user)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88e15276..2b469a93 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,6 +51,9 @@
     <string name="most_popular_boards_by_posts_title">Most Popular Boards By Posts</string>
     <string name="most_popular_boards_by_activity_title">Most Popular Boards By Activity</string>
 
+    <!--Downloads Activity-->
+    <string name="downloads">Downloads</string>
+
     <!--About Activity-->
     <string name="about">About</string>
     <string name="version">v%1$s</string>