Layout stuff
Merge branch 'master' of github.com:mcintyre321/Noodles