Edit view fixes