Refactored to use DrawerLayout