Revert "Fix merge conflicts"

This reverts commit 8660eaf08c44473280cd23adafab6f67fc9f027c, reversing
changes made to 92ddc06ae5c2c8f056b534039197a2748414e27f.
Add view and then edit capabilities