made header wider if primtiive, thinner otherwise; minor changes in header label display