Merge pull request #19 from sodevious/master

Updating the layout, starting to make a better flow
Some sensible defaults