HTML whitespaces / indentation / minor errors
Simplified JS code
Merge pull request #1 from bpierre/master

HTML / JS cleaning