Major template/css changes
Merge pull request #5 from sts/master

Major template/css changes