some UI and grant changes