moved changed to ui to main