Updated New and Edit views