Fixes #2 and some css & js clean up.