Finished updating layout/tidying