Refactored the Navigation Drawer