Features/so ui move