Adding view changes, some controller changes