js rework and html simplification
Merge pull request #9 from cwnidog/craig-new

js rework and html simplification