little bit of everything
i apologize for this terrible commit and the pull request that comes with it
Merge pull request #25 from otters-2014/layout

Layout