Fix layouts

Turns out all that was needed was including layout.js
Comment out assert in util
Write our own assertTrue