Bug 25736: Standardise on displayed and clean up displayed section
Bug 25751: User local end instead of client end in modals