Fixes in UI.
Fixes
Refactor, saving changes