Rearrange code
Remove custom theme
Small change in Manifest
Update Maven Dependencies
Update MenuDrawer dependency