Updating some of the tag names of base html
Cleaning up css and wireframe