Create and Edit view updated