I actually wonder if layout.js should handle this, but we can take care of that later.