Fixed issue: Some admin/menu controler fixes