Re-estructure the re-design in html & css