cancel buttons added to get back to the previous screens
Merge pull request #7 from Remo/minor-ui-fixes

cancel buttons added to get back to the previous screens