General fixes including fixes to delete button