#3 : Improved pages layout