Cleaing up UI a bit