Modified Edit view, move functiion to new place