re-arragned several items