Merge "comment" & "edit" into a single window

[dt.em]

I think it makes sense, and will make comment editing much simpler. A single window just for adding/editing comment seems strange to me.
What do you think?