UI Improvement: Action bar; Navigation drawer, Buttons
Merge conflicts
Merge conflicts
Merge conflicts