Working on styles
Merge pull request #16 from wvoelcker/master

Improving styles