Feature/readonly journal form clean

Finishes #313 and #321 .