View fixes
Fix conflict