Fix Bug 948541, recheck everything regarding the new UI ready for prod

@erikrose r?