Update for Dave's layout pull request