Cleaned HTML and some js

Needed more refactoring