Design fixes
Merge pull request #2 from charliegerard/master

Design fixes