Merge pull request #36 from Gavin-AG/master

order trace update
layout update