Menu z-order issue fix