Improve project admin adn fix #bb-526
Fix #BB-580