lots of view improvements