Akhay/Pooja: Some refactoring in capitation grant view