Updated UI & Actions