Fix for the broken whiteboard toolbar

I broke the whiteboard toolbar, this pull request fixes that.

It also removes more code related to the old whiteboard button.