Adding toolbar for real this time.

Issue #11