Refactored to use a master page