moved back stuff that only had to do with view