View updates, fixed some things