Various bug and style fixes. Add 4*25 column to editor.