Merge pull request #6 from talzag/master

More CSS work