Improve the general layout for demography section

Change-Id: If740dfa1dc0b1c7a2c081a89b13079280335e89b
Merge "Improve the general layout for demography section"