Jeffries layout changes.

I'm not sure why this pull request also includes the changes you've already made-- maybe I did my own pull wrong. But the important thing is the changes to the jeffries layout map.