Added edit and remove controller