Merge in UI fixes

Merge in UI fixes from my staging branch