toolbar and ajax fix patch