some changes

for multi column menu
remove conflict