further improved create/edit activity.