Tidying up the structure, adding contents, date, back to top