Moving to a tabbed page architecture