Updated toolbar and removed options that are currently not avaialble [Workbench]