Made some changes to the html structure