Ticket #38 Fixing wave issue overlapping on menu