Wip/switch view functionality

Merge of check boxes to switch views between personal and team view with Rachel and TJ.