Added a separate toolbar
Revert "Added a separate toolbar"

This reverts commit 8b9c4529c227da874cb757a7dd525a9797affda6.
Updated the description