RC: Cleanup and reorg the categories layouts

Change-Id: Ic20e743d0453cdd657702afc5399a4785ac6dd6b
Merge "RC: Cleanup and reorg the categories layouts" into kitkat