cleaned up HTML, changed some IDs to classes, etc.
Pulled from origin and merged changes