fix lever positioning and adjust BiMap sctructure