Some UI and Color Enhancements