Simplifed the Handlers for pages