diff --git a/src/client/app.jsx b/src/client/app.jsx
index 2b1c510fa..6009e2007 100644
--- a/src/client/app.jsx
+++ b/src/client/app.jsx
@@ -61,7 +61,7 @@ const sidebarWithProvider = (
   </Provider>
 )
 
-ReactDOM.render(sidebarWithProvider, document.getElementById('side-nav'))
+ReactDOM.render(sidebarWithProvider, document.getElementById('sidebar'))
 
 if (document.getElementById('modal-wrapper')) {
   const RootModal = (
diff --git a/src/client/components/Nav/Sidebar/index.jsx b/src/client/components/Nav/Sidebar/index.jsx
index 85a6f4c9e..282788345 100644
--- a/src/client/components/Nav/Sidebar/index.jsx
+++ b/src/client/components/Nav/Sidebar/index.jsx
@@ -78,258 +78,286 @@ class Sidebar extends React.Component {
   render () {
     const { activeItem, activeSubItem, sessionUser } = this.props
     return (
-      <ul className='side-nav'>
-        {sessionUser && Helpers.canUser('agent:*', true) && (
-          <SidebarItem
-            text='Dashboard'
-            icon='dashboard'
-            href='/dashboard'
-            class='navHome'
-            active={activeItem === 'dashboard'}
-          />
-        )}
-        {sessionUser && Helpers.canUser('tickets:view') && (
-          <SidebarItem
-            text='Tickets'
-            icon='assignment'
-            href='/tickets'
-            class='navTickets no-ajaxy'
-            hasSubmenu={true}
-            subMenuTarget='tickets'
-            active={activeItem === 'tickets'}
-          >
-            <Submenu id='tickets'>
-              <SubmenuItem
-                text='Active'
-                icon='timer'
-                href='/tickets/active'
-                active={activeSubItem === 'tickets-active'}
-              />
-              <SubmenuItem
-                text='Assigned'
-                icon='assignment_ind'
-                href='/tickets/assigned'
-                active={activeSubItem === 'tickets-assigned'}
-              />
-              <SubmenuItem
-                text='Unassigned'
-                icon='person_add_disabled'
-                href='/tickets/unassigned'
-                active={activeSubItem === 'tickets-unassigned'}
-              />
-              <NavSeparator />
-              <SubmenuItem text='New' icon='&#xE24D;' href='/tickets/new' active={activeSubItem === 'tickets-new'} />
-              <SubmenuItem
-                text='Pending'
-                icon='&#xE629;'
-                href='/tickets/pending'
-                active={activeSubItem === 'tickets-pending'}
-              />
-              <SubmenuItem text='Open' icon='&#xE2C8;' href='/tickets/open' active={activeSubItem === 'tickets-open'} />
-              <SubmenuItem
-                text='Closed'
-                icon='&#xE2C7;'
-                href='/tickets/closed'
-                active={activeSubItem === 'tickets-closed'}
-              />
-            </Submenu>
-          </SidebarItem>
-        )}
-        <SidebarItem
-          text='Messages'
-          icon='chat'
-          href='/messages'
-          class='navMessages'
-          active={activeItem === 'messages'}
-        />
-        {sessionUser && Helpers.canUser('accounts:view') && (
-          <SidebarItem
-            text='Accounts'
-            icon='&#xE7FD;'
-            href='/accounts'
-            class='navAccounts'
-            active={activeItem === 'accounts'}
-            subMenuTarget='accounts'
-            hasSubmenu={sessionUser && Helpers.canUser('agent:*', true)}
-          >
+      <div
+        className={'sidebar nopadding'}
+        style={{ overflowX: 'hidden', top: this.props.notice ? '105px' : '75px' }}
+        data-scroll-opacitymax='0.1'
+      >
+        <div id={'side-nav-container'} style={{ minHeight: 'calc(100% - 50px)' }}>
+          <ul className='side-nav'>
             {sessionUser && Helpers.canUser('agent:*', true) && (
-              <Submenu id='accounts'>
-                <SubmenuItem
-                  href={'/accounts/customers'}
-                  text={'Customers'}
-                  icon={'account_box'}
-                  active={activeSubItem === 'accounts-customers'}
-                />
-                {sessionUser && Helpers.canUser('agent:*', true) && (
+              <SidebarItem
+                text='Dashboard'
+                icon='dashboard'
+                href='/dashboard'
+                class='navHome'
+                active={activeItem === 'dashboard'}
+              />
+            )}
+            {sessionUser && Helpers.canUser('tickets:view') && (
+              <SidebarItem
+                text='Tickets'
+                icon='assignment'
+                href='/tickets'
+                class='navTickets no-ajaxy'
+                hasSubmenu={true}
+                subMenuTarget='tickets'
+                active={activeItem === 'tickets'}
+              >
+                <Submenu id='tickets'>
                   <SubmenuItem
-                    href={'/accounts/agents'}
-                    text={'Agents'}
-                    icon={'account_circle'}
-                    active={activeSubItem === 'accounts-agents'}
+                    text='Active'
+                    icon='timer'
+                    href='/tickets/active'
+                    active={activeSubItem === 'tickets-active'}
+                  />
+                  <SubmenuItem
+                    text='Assigned'
+                    icon='assignment_ind'
+                    href='/tickets/assigned'
+                    active={activeSubItem === 'tickets-assigned'}
+                  />
+                  <SubmenuItem
+                    text='Unassigned'
+                    icon='person_add_disabled'
+                    href='/tickets/unassigned'
+                    active={activeSubItem === 'tickets-unassigned'}
+                  />
+                  <NavSeparator />
+                  <SubmenuItem
+                    text='New'
+                    icon='&#xE24D;'
+                    href='/tickets/new'
+                    active={activeSubItem === 'tickets-new'}
+                  />
+                  <SubmenuItem
+                    text='Pending'
+                    icon='&#xE629;'
+                    href='/tickets/pending'
+                    active={activeSubItem === 'tickets-pending'}
                   />
-                )}
-                {sessionUser && Helpers.canUser('admin:*') && (
                   <SubmenuItem
-                    href={'/accounts/admins'}
-                    text={'Admins'}
-                    icon={'how_to_reg'}
-                    active={activeSubItem === 'accounts-admins'}
+                    text='Open'
+                    icon='&#xE2C8;'
+                    href='/tickets/open'
+                    active={activeSubItem === 'tickets-open'}
                   />
+                  <SubmenuItem
+                    text='Closed'
+                    icon='&#xE2C7;'
+                    href='/tickets/closed'
+                    active={activeSubItem === 'tickets-closed'}
+                  />
+                </Submenu>
+              </SidebarItem>
+            )}
+            <SidebarItem
+              text='Messages'
+              icon='chat'
+              href='/messages'
+              class='navMessages'
+              active={activeItem === 'messages'}
+            />
+            {sessionUser && Helpers.canUser('accounts:view') && (
+              <SidebarItem
+                text='Accounts'
+                icon='&#xE7FD;'
+                href='/accounts'
+                class='navAccounts'
+                active={activeItem === 'accounts'}
+                subMenuTarget='accounts'
+                hasSubmenu={sessionUser && Helpers.canUser('agent:*', true)}
+              >
+                {sessionUser && Helpers.canUser('agent:*', true) && (
+                  <Submenu id='accounts'>
+                    <SubmenuItem
+                      href={'/accounts/customers'}
+                      text={'Customers'}
+                      icon={'account_box'}
+                      active={activeSubItem === 'accounts-customers'}
+                    />
+                    {sessionUser && Helpers.canUser('agent:*', true) && (
+                      <SubmenuItem
+                        href={'/accounts/agents'}
+                        text={'Agents'}
+                        icon={'account_circle'}
+                        active={activeSubItem === 'accounts-agents'}
+                      />
+                    )}
+                    {sessionUser && Helpers.canUser('admin:*') && (
+                      <SubmenuItem
+                        href={'/accounts/admins'}
+                        text={'Admins'}
+                        icon={'how_to_reg'}
+                        active={activeSubItem === 'accounts-admins'}
+                      />
+                    )}
+                  </Submenu>
                 )}
-              </Submenu>
+              </SidebarItem>
             )}
-          </SidebarItem>
-        )}
-        {sessionUser && Helpers.canUser('groups:view') && (
-          <SidebarItem
-            text='Customer Groups'
-            icon='supervisor_account'
-            href='/groups'
-            class='navGroups'
-            active={activeItem === 'groups'}
-          />
-        )}
-        {sessionUser && Helpers.canUser('teams:view') && (
-          <SidebarItem text='Teams' icon='wc' href='/teams' class='navTeams' active={activeItem === 'teams'} />
-        )}
-        {sessionUser && Helpers.canUser('departments:view') && (
-          <SidebarItem
-            text='Departments'
-            icon='domain'
-            href='/departments'
-            class='navTeams'
-            active={activeItem === 'departments'}
-          />
-        )}
-        {sessionUser && Helpers.canUser('reports:view') && (
-          <SidebarItem
-            text='Reports'
-            icon='assessment'
-            href='/reports/generate'
-            class='navReports no-ajaxy'
-            hasSubmenu={true}
-            subMenuTarget='reports'
-            active={activeItem === 'reports'}
-          >
-            <Submenu id='reports'>
-              <SubmenuItem
-                text='Generate'
-                icon='timeline'
-                href='/reports/generate'
-                active={activeSubItem === 'reports-generate'}
-              />
-              <NavSeparator />
-              <SubmenuItem
-                text='Group Breakdown'
+            {sessionUser && Helpers.canUser('groups:view') && (
+              <SidebarItem
+                text='Customer Groups'
                 icon='supervisor_account'
-                href='/reports/breakdown/group'
-                active={activeSubItem === 'reports-breakdown-group'}
+                href='/groups'
+                class='navGroups'
+                active={activeItem === 'groups'}
               />
-              <SubmenuItem
-                text='User Breakdown'
-                icon='perm_identity'
-                href='/reports/breakdown/user'
-                active={activeSubItem === 'reports-breakdown-user'}
+            )}
+            {sessionUser && Helpers.canUser('teams:view') && (
+              <SidebarItem text='Teams' icon='wc' href='/teams' class='navTeams' active={activeItem === 'teams'} />
+            )}
+            {sessionUser && Helpers.canUser('departments:view') && (
+              <SidebarItem
+                text='Departments'
+                icon='domain'
+                href='/departments'
+                class='navTeams'
+                active={activeItem === 'departments'}
               />
-            </Submenu>
-          </SidebarItem>
-        )}
-
-        {/*{this.renderPlugins()}*/}
+            )}
+            {sessionUser && Helpers.canUser('reports:view') && (
+              <SidebarItem
+                text='Reports'
+                icon='assessment'
+                href='/reports/generate'
+                class='navReports no-ajaxy'
+                hasSubmenu={true}
+                subMenuTarget='reports'
+                active={activeItem === 'reports'}
+              >
+                <Submenu id='reports'>
+                  <SubmenuItem
+                    text='Generate'
+                    icon='timeline'
+                    href='/reports/generate'
+                    active={activeSubItem === 'reports-generate'}
+                  />
+                  <NavSeparator />
+                  <SubmenuItem
+                    text='Group Breakdown'
+                    icon='supervisor_account'
+                    href='/reports/breakdown/group'
+                    active={activeSubItem === 'reports-breakdown-group'}
+                  />
+                  <SubmenuItem
+                    text='User Breakdown'
+                    icon='perm_identity'
+                    href='/reports/breakdown/user'
+                    active={activeSubItem === 'reports-breakdown-user'}
+                  />
+                </Submenu>
+              </SidebarItem>
+            )}
 
-        {sessionUser && Helpers.canUser('notices:view') && (
-          <SidebarItem
-            text='Notices'
-            icon='campaign'
-            href='/notices'
-            class='navNotices'
-            active={activeItem === 'notices'}
-          />
-        )}
+            {/*{this.renderPlugins()}*/}
 
-        {sessionUser && Helpers.canUser('settings:edit') && (
-          <SidebarItem
-            text='Settings'
-            icon='settings'
-            href='/settings/general'
-            class='navSettings no-ajaxy'
-            hasSubmenu={true}
-            subMenuTarget='settings'
-            active={activeItem === 'settings'}
-          >
-            <Submenu id='settings'>
-              <SubmenuItem text='General' icon='tune' href='/settings' active={activeSubItem === 'settings-general'} />
-              <SubmenuItem
-                text='Appearance'
-                icon='style'
-                href='/settings/appearance'
-                active={activeSubItem === 'settings-appearance'}
-              />
-              <SubmenuItem
-                text='Tickets'
-                icon='assignment'
-                href='/settings/tickets'
-                active={activeSubItem === 'settings-tickets'}
-              />
-              <SubmenuItem
-                text='Permissions'
-                icon='security'
-                href='/settings/permissions'
-                active={activeSubItem === 'settings-permissions'}
-              />
-              <SubmenuItem
-                text='Mailer'
-                icon='email'
-                href='/settings/mailer'
-                active={activeSubItem === 'settings-mailer'}
+            {sessionUser && Helpers.canUser('notices:view') && (
+              <SidebarItem
+                text='Notices'
+                icon='campaign'
+                href='/notices'
+                class='navNotices'
+                active={activeItem === 'notices'}
               />
-              {/*<SubmenuItem text="Notifications" icon="" href="/settings/notifications" active={activeSubItem === 'settings-notifications'} />*/}
-              <SubmenuItem
-                href={'/settings/elasticsearch'}
-                text={'Elasticsearch'}
-                icon={'search'}
-                active={activeSubItem === 'settings-elasticsearch'}
-              />
-              <SubmenuItem
-                text='Push Service'
-                icon='mobile_friendly'
-                href='/settings/tps'
-                active={activeSubItem === 'settings-tps'}
-              />
-              <SubmenuItem
-                text='Backup/Restore'
-                icon='archive'
-                href='/settings/backup'
-                active={activeSubItem === 'settings-backup'}
-              />
-              <SubmenuItem
-                text='Server'
-                icon='dns'
-                href='/settings/server'
-                active={activeSubItem === 'settings-server'}
-              />
-              <SubmenuItem
-                text='Legal'
-                icon='gavel'
-                href='/settings/legal'
-                active={activeSubItem === 'settings-legal'}
-              />
-              {sessionUser && Helpers.canUser('settings:logs') && (
-                <SubmenuItem
-                  text='Logs'
-                  icon='remove_from_queue'
-                  href='/settings/logs'
-                  hasSeperator={true}
-                  active={activeSubItem === 'settings-logs'}
-                />
-              )}
-            </Submenu>
-          </SidebarItem>
-        )}
-        <NavSeparator />
-        <SidebarItem href='/about' icon='help' text='About' active={activeItem === 'about'} />
-        <SidebarItem href={'https://www.trudesk.io'} icon={'cloud'} text={'Cloud'} target={'_blank'} />
-      </ul>
+            )}
+
+            {sessionUser && Helpers.canUser('settings:edit') && (
+              <SidebarItem
+                text='Settings'
+                icon='settings'
+                href='/settings/general'
+                class='navSettings no-ajaxy'
+                hasSubmenu={true}
+                subMenuTarget='settings'
+                active={activeItem === 'settings'}
+              >
+                <Submenu id='settings'>
+                  <SubmenuItem
+                    text='General'
+                    icon='tune'
+                    href='/settings'
+                    active={activeSubItem === 'settings-general'}
+                  />
+                  <SubmenuItem
+                    text='Appearance'
+                    icon='style'
+                    href='/settings/appearance'
+                    active={activeSubItem === 'settings-appearance'}
+                  />
+                  <SubmenuItem
+                    text='Tickets'
+                    icon='assignment'
+                    href='/settings/tickets'
+                    active={activeSubItem === 'settings-tickets'}
+                  />
+                  <SubmenuItem
+                    text='Permissions'
+                    icon='security'
+                    href='/settings/permissions'
+                    active={activeSubItem === 'settings-permissions'}
+                  />
+                  <SubmenuItem
+                    text='Mailer'
+                    icon='email'
+                    href='/settings/mailer'
+                    active={activeSubItem === 'settings-mailer'}
+                  />
+                  {/*<SubmenuItem text="Notifications" icon="" href="/settings/notifications" active={activeSubItem === 'settings-notifications'} />*/}
+                  <SubmenuItem
+                    href={'/settings/elasticsearch'}
+                    text={'Elasticsearch'}
+                    icon={'search'}
+                    active={activeSubItem === 'settings-elasticsearch'}
+                  />
+                  <SubmenuItem
+                    text='Push Service'
+                    icon='mobile_friendly'
+                    href='/settings/tps'
+                    active={activeSubItem === 'settings-tps'}
+                  />
+                  <SubmenuItem
+                    text='Backup/Restore'
+                    icon='archive'
+                    href='/settings/backup'
+                    active={activeSubItem === 'settings-backup'}
+                  />
+                  <SubmenuItem
+                    text='Server'
+                    icon='dns'
+                    href='/settings/server'
+                    active={activeSubItem === 'settings-server'}
+                  />
+                  <SubmenuItem
+                    text='Legal'
+                    icon='gavel'
+                    href='/settings/legal'
+                    active={activeSubItem === 'settings-legal'}
+                  />
+                  {sessionUser && Helpers.canUser('settings:logs') && (
+                    <SubmenuItem
+                      text='Logs'
+                      icon='remove_from_queue'
+                      href='/settings/logs'
+                      hasSeperator={true}
+                      active={activeSubItem === 'settings-logs'}
+                    />
+                  )}
+                </Submenu>
+              </SidebarItem>
+            )}
+            <NavSeparator />
+            <SidebarItem href='/about' icon='help' text='About' active={activeItem === 'about'} />
+            <SidebarItem href={'https://www.trudesk.io'} icon={'cloud'} text={'Cloud'} target={'_blank'} />
+          </ul>
+        </div>
+        <div className='side-nav-bottom-panel'>
+          <a id='expand-menu' className='no-ajaxy' href='#'>
+            <i className='material-icons'>menu</i>Collapse Menu
+          </a>
+        </div>
+      </div>
     )
   }
 }
@@ -339,13 +367,15 @@ Sidebar.propTypes = {
   activeItem: PropTypes.string.isRequired,
   activeSubItem: PropTypes.string.isRequired,
   sessionUser: PropTypes.object,
-  plugins: PropTypes.array
+  plugins: PropTypes.array,
+  notice: PropTypes.object
 }
 
 const mapStateToProps = state => ({
   activeItem: state.sidebar.activeItem,
   activeSubItem: state.sidebar.activeSubItem,
-  sessionUser: state.shared.sessionUser
+  sessionUser: state.shared.sessionUser,
+  notice: state.shared.notice
 })
 
 export default connect(mapStateToProps, { updateNavChange })(Sidebar)
diff --git a/src/pdf/index.js b/src/pdf/index.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/views/partials/nav.hbs b/src/views/partials/nav.hbs
index e3be533c4..571869773 100644
--- a/src/views/partials/nav.hbs
+++ b/src/views/partials/nav.hbs
@@ -1,10 +1,2 @@
-<div class="sidebar nopadding " style="{{#if data.common.notice}}top: 105px;{{/if}} overflow-x: hidden;" data-scroll-opacitymax="0.1">
-    <div class="side-nav-container" style="min-height: calc(100% - 50px);">
-        <div id="side-nav"></div>
-    </div>
-    <div class="side-nav-bottom-panel">
-        <a id="expand-menu" class="no-ajaxy" href="#"><i class="material-icons">menu</i>Collapse Menu</a>
-    </div>
-</div>
-
+<div id="sidebar"></div>
 <div class="sidebar-to-right"></div>
\ No newline at end of file