Clraning up tabs for spaces.  Also adding functionality for right-click
cancelling the creation flow for better usability.