Layout changes for new height spec
Layout changes
Update for 29th Sept
Merge pull request #12 from SimonbJohnson/master

Sync to master