lots of improvements to views