cleaned up javascript
fixed up html