bugfixes from view logic refactor