Added edit and remove option