Improve Design (NavigationDrawer), Bug fixes