changed toolbar handling