Merge pull request #1 from KeithP/develop

finished layout changes