fix toolbar mode setting
some fixes