SSP-2833. WIP. UI mainly