Improve gear layout
Improve gear layout