re #926 - Code cleanup and implemented pagination on district view
Merge branch 'feature/926-7' into staging