Added cancel buttons, removed go back button, some template fixes