Added delete button and fixed wonkiness