Fixed view issues