Moved conditions for page into page