Change for js and style
Merge pull request #20 from cucka/master

js and style changes