Added delete option + few fixes