Changed UI and Main
Merge conflict