Added functionality to switch between display modes
Merge remote-tracking branch 'github/master' into master1