Make page more modular.