1829 user experience redesign

Fixes from yesterdays testing.