Merge pull request #65 from torhve/master

CSS + layout