fixed some styling bugs
Merge pull request #111 from tiger-swallowtails-2014/styling_stuff

fixed some styling bugs