Switched over all classes to the NavigationDrawer except Options