Mostly view changes and some cleanup