cleaned up and prepared to implement DrawerLayout