Fixed issue with back button and nav drawer