More strict page validations added, minor fixes