Html changes

Changes to structure of html  code and other layout changes