admin halls fixes
Merge branch 'feature/halls_hot_fixes' into staging