Styling changes to put things in generally the correct area
Merge pull request #50 from syqnew/styling-changes

Styling changes to put things in generally the correct area