Upgrades for Rollout of new admin section

This covers most of the bug fixes and changes following the rollout of
the new scripting.