Fix error and get rid of delete button.
Merge remote-tracking branch 'origin/master'