Trying to fix view2 dots
Fixed merge conflict