Further improved pages