Lots of work on naming and view arranging.