View fixes