Improved Wheel and move toolBar to its own file.