Merged Navigation Drawer

Merged navigation drawer and organised activities and small bug fix