Fix view issues;