Massive HTML Overhaul, JS reorg

Rebuilt the HTML to Drupal Standards and removed JS that was causing
issues