Updated page controller