Made toolbar optional.