Refactor to better manage page init events (still not enough)