More view fixes