Simplify modular page logic