#452: Changes to UI