Updated UI & small bugfix