Further improvements in the display and back button handling