Fixes in Menutable