Cleaned up more code and refactored most of MainActivity, Navigation and Filter Drawer. Remaining will be done once I modify the UI for the drawers.