#98: Alter view modes due to style changes
Merge branch 'feature/98'