Added buttons to switch views
Merge remote-tracking branch 'origin/group_dev' into group_dev
commit