Chloe &Nicola|finished layout
fixed merge conflicts