MainActivity Action Menu and Drawer Refactoring