CSS/JS changes

Few bug fixes and enhancements.
Merge pull request #989 from Destroy666x/CSSJS

CSS/JS changes