Added support for editing activities in place