Fixing back button issue and "more"