Moving common parts of crosswalk targets into options