fixed pages bug
some minor layout changes