Final fixed for menu system