View update
Merge branch 'ViewUpdates'