Merging layout1 branch with Master branch.

Website will actually render/work properly, now that it’s merged into the Master branch.