Revert "Revert "more delete button fixes and some submit ones""

This reverts commit 8a533607a051c0b353eb8d195b70100741c91d11.