fixed back button issue but navigation is wonky :/