Andrews fix for menu tabs