Features/so ui move

I see.