Added back button support and other stuff