Minor UI Clean up