Merge pull request #28 from bheesham/master

CSS tidyup, JS error fix