added back button functionality
merge