Tidy UI a little bit