Fix conditions for View file