MBug: Improvements to Label view.