Minor update to View
Merge branch 'develop'