Finished UpfrontIndex rewrite
Continued rewriting the default layout