Tidied up layout and sources.
Merge branch 'master' of github.com:nanotaboada/sandbox
Tidied up layout and sources.