Back button handling fixed/improved