Merge pull request #1009 from hennevogel/routing

Fix program routing outside of Admin

Merge pull request #1002 from nishanthvijayan/fix-deprecation-warnings

Fix deprecation warnings