some more view clean up