Again more view fixes