add singelton to manager

fix edit
fix adding