View fixes. Commented code