I begin edit view mode logic.
Merge branch 'rfrost'