Re-implemented app sidebar

Change-Id: I594ff26596e84eb5641005ff391915d60662b050