Some simple UI color changes
fix conflicts