worked on UI uniformity
resolved conflict