Update page module

Add some changes on page module