add fix for expand menu
add fixes for expand menu