Final menu fixes