Feature 3265: Some UI cleanup on the guide