Ok 1 more commit, improved view changes