Timestamp/Description editing UI
Merge remote-tracking branch 'origin/joinerr' into sachin