fixed menu wrap and polygon issue