More UI improvements
Merged color and label changes