Implemented Nav Drawer & Refactor