small view updates
Small merge fix
small view updates