Mega update to UI and form elements