Updated UI a little bit