diff --git a/resources/lang/en/navmenu.php b/resources/lang/en/navmenu.php
index 290d08e6b..2634f23f5 100644
--- a/resources/lang/en/navmenu.php
+++ b/resources/lang/en/navmenu.php
@@ -1,7 +1,6 @@
 <?php
 
 return [
-
 	'search'			=> 'Search',
 	'home'				=> 'Home',
 	'local'				=> 'Local',
@@ -16,5 +15,5 @@ return [
 	'admin'				=> 'Admin',
 	'logout'			=> 'Logout',
 	'directMessages'	=> 'Direct Messages',
-
+	'composePost'		=> 'Compose Post',
 ];
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index bce7c31bf..202b568ec 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -66,7 +66,7 @@
                 <a class="nav-link {{request()->is('discover')?'text-dark':'text-lighter'}}" href="/discover"><i class="fas fa-search fa-lg"></i></a>
               </li>
               <li class="nav-item">
-                <div class="nav-link text-lighter cursor-pointer" data-toggle="modal" data-target="#composeModal"><i class="fas fa-camera fa-lg"></i></div>
+                <div class="nav-link text-lighter cursor-pointer" onclick="App.util.compose.post()"><i class="fas fa-camera fa-lg"></i></div>
               </li>
               <li class="nav-item">
                 <a class="nav-link {{request()->is('account/activity')?'text-dark':'text-lighter'}}" href="/account/activity"><i class="far fa-heart fa-lg"></i></a>
diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index b57991048..74354bfd1 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -47,26 +47,21 @@
                             </a>
                         </li>
                     </div>
-                    <div class="d-none d-md-block">
-                        <li class="nav-item px-md-2">
-                            <div title="Create new post" data-toggle="tooltip" data-placement="bottom">
-                                <a href="{{route('compose')}}" class="nav-link" data-toggle="modal" data-target="#composeModal">
-                                  <i class="fas fa-camera-retro fa-lg text-muted"></i>
-                                </a>
-                            </div>
-                        </li>
-                    </div>
                     <li class="nav-item dropdown ml-2">
                         <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="User Menu" data-toggle="tooltip" data-placement="bottom">
                             <i class="far fa-user fa-lg text-muted"></i>
                         </a>
 
                         <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
+                            <div class="dropdown-item font-weight-bold cursor-pointer" onclick="App.util.compose.post()">
+                                <span class="fas fa-camera-retro pr-1"></span>
+                                {{__('navmenu.composePost')}}
+                            </div>
+                            <div class="dropdown-divider"></div>
                             <a class="dropdown-item font-weight-bold" href="/i/me">
                                 <span class="far fa-user pr-1"></span>
                                 {{__('navmenu.myProfile')}}
                             </a>
-                            <div class="dropdown-divider"></div>
                             <a class="d-block d-md-none dropdown-item font-weight-bold" href="{{route('discover')}}">
                                 <span class="far fa-compass pr-1"></span>
                                 {{__('navmenu.discover')}}
@@ -75,16 +70,10 @@
                                 <span class="far fa-bell pr-1"></span>
                                 Notifications
                             </a>
-                            <div class="dropdown-divider"></div>
-                            <a class="dropdown-item font-weight-bold" href="{{route('timeline.personal')}}">
-                                <span class="fas fa-home pr-1"></span>
-                                {{__('navmenu.myTimeline')}}
-                            </a>
                             <a class="dropdown-item font-weight-bold" href="{{route('timeline.public')}}">
                                 <span class="far fa-map pr-1"></span>
                                 {{__('navmenu.publicTimeline')}}
                             </a>
-                            <div class="dropdown-divider"></div>
                             <a class="dropdown-item font-weight-bold" href="{{route('settings')}}">
                                 <span class="fas fa-cog pr-1"></span>
                                 {{__('navmenu.settings')}}
@@ -94,8 +83,8 @@
                                 <span class="fas fa-cogs pr-1"></span>
                                 {{__('navmenu.admin')}}
                             </a>
-                            <div class="dropdown-divider"></div>
                             @endif
+                            <div class="dropdown-divider"></div>
                             <a class="dropdown-item font-weight-bold" href="{{ route('logout') }}"
                                onclick="event.preventDefault();
                                              document.getElementById('logout-form').submit();">