changed UX, added back button