Rebuild pages layout
Fixes... Fixes everywhere...