Added in Label text with value, reordered & reorganised some items