More view layer changes, institute better now