Edit: Rework overall layout for consistency

Rework overall layout for consistency.

This uses the respective collection cells to 'support' the edit mode.

Additionally, this MR includes some cosmetic/bug fixes related to the edit layout.