CSS&Template fixes
Merge pull request #2 from lynx1983/master

CSS&Template fixes