Form markup changes

Refactor CSS structure and add some corrections to HTML.