toolbar re-orgainize to allow external view helpers