Move more stuff out into page.