Complete styling
Merge pull request #89 from concreted/master

Complete styling