Tighten up toolbar, switch to more accessible button elements
Switched divs/spans to buttons when appropriate.
Fixed some outstanding issues with the switch to buttons