Fixes for layout.
Resurrecting more tasty Lamothe fixes.
Merge pull request #33 from LoomSDK/BJG-FixLayoutReverts

Fixes for layout.