Updated toolbar to use toggle buttons, preliminary support for simulataneous views