Style fixes after mega-merge
Style fixes after mega-merge
Merge pull request #14 from Lycanstrife/master

Fixes for layout after mega-merge