change toolbar FlowLayout to the modified version by greearb and jzd