Minor UI tweaks. Renamed labels.