fix toolbar and description