More work to subpages, events work still bugs