Toolbar mod is doing its own thing now :(