Views fixes