Fix some view issues