WIP: pages improvements