Corrected typos/moved changes to its own view