Update to toolbar and view main. Closes #15