Update css style
Fix issue #12
Merge pull request #14 from tefra/dev

Fix issue #12 and #13