Rearrange UI and add extra variables back in for plot options
extra variables for plot options.