Updated UI and some things