Fixed indentation, jshinted javascript, updated HTML
Merge pull request #427 from inverse/popup-fix

popup tidy up