Tidying more content
New html structure