Minor UI and text changes