Code clean up.
Add a view toggle for the tool bar.