Improving UI
Solved merge conflict