Added Back buttons for navigation and minor changes