Fixed layout, refactored.
Merge pull request #15 from eggrobin/layout

Fixed layout, refactored.
Forgot to pull before branching.