more logical view naming
improved editing