Added additional reporting in admin tool, fixed issue with nav