Edit View

removed some redundancies