Fixing pages setup