Reorganize app side bars

Make separate AppBars class so we get
App Bars menu with Circle and Sidebar

PS2: Fix NPE FC and fix my erro

Change-Id: Ic47efa0498a3a4214fb441d94a900901bbde60e5