Begin folding router into layout to avoid all these problems, eventually router logic into mixin