null delete button fix
Merge branch 'journal'