View fixes

by lopata7