Moved the logic for displaying measurement Categories in Layout mode into its own controller--LayoutMeasurements