Edit view markup fixes