Some refactoring of activity/layout, removed Nav Drawer.