Change content to contentPage
Some minor modification