Merge pull request #20 from lalogf/master

Css changes
bug fixes dawn nov 24
Conflicts resolved