Features/so ui move

Great to see this cleanup and that nicely contained component.