Fixes and few features: delete buttons, and finish button.