SSP-1333 - Save plan and template drop-down re-arrange for usability