Some JS tweaks.
Merge pull request #12 from ABucin/master

Some JS tweaks.