Sorry, you're absolutely correct - I had misinterpreted the dev board layout screenshots as the final phone layout screenshots.

That'll teach me to post after I should be asleep!