UI and model changes for backend SU and SP changes