Updated UI a bit