Refactor/fix back button