Added back button functionality to resolve #26