More UI refinements
Resolve conflicts and merge