cancel buttons added to get back to the previous screens

Found a cancel button in one screen but not in the others, here are two more of them