Improved colors and UI changes