changed activity layout and return method
Added back buttons for navigation