Cleaned UI a little
merge conflict