messing with the css + added first draft of event handler
Merge branch 'master' into gh-pages