wip view state manager, fix issues with last commit, etc...