Updates to WetKit Layout.
Merge branch 'refs/heads/new' into 7.x-1.x