Minor UI touches and correcct back button behaviour.