Fixed most of the layouts in the centre area and began tidying code