toolbar demo updates