Added cancel buttons, some template fixes