App sidebar [2/2]

Change-Id: I1347b5ecc224b54d0fe89ba5ca6064bf5fc4ad8e
Ribbon fixes and upgrades

Change-Id: I12b16583ce0a41e9680d7f5bbaf59b7cb63a08ef