Revert "Revert "App sidebar [1/2]""

This reverts commit 08f161d0ce1eac030b5acd73cc92f218174db165.
FIX

Change-Id: I7ad57e3b8ddb011b5082b494eb9c9c3997230264