fixed back button behaviour, minor tweaks