Fix add project feature
Merge branch 'controls'