fixed some styling issues. closes #33
Merge branch 'master' into webadapter