Revamp on page layout