grants upgrades plus fix on resizing window
Merge branch 'newgrants' into testing