Changed the id of the cancel button, now that we are not using panopoly.
Removed cancel link. Without panopoly there is a cancel button.
Adding the cancel link back, if we decide to use just panopoly magic, the cancel link will be needed again.