fixing page structures
Fixed merge conflicts