Updated page structure