slight view tweaks and fixed a few failing tests