[CAL-164] Navigation clean ups.  Removed redundant buttons (eg. preferences link on the preferences page). Added cancel buttons to replace some of the other navigation buttons.