Making UI a bit cleaner