Made final corrections and changed view