Work on design/layout
Merge branch 'master' of https://github.com/basicallydan/gogive
Work on design/layout