Rework to a single page