All changes as per Dannys request - still need to sort out ie styling though!