Refactoring: GenericActivity now handles Drawer