Back button and misc tweaks