Cleaned UI a little bit