Moving forward on the UI rework.
Merge remote-tracking branch 'origin/master'