Minor UI Updates, Cleanup