finished menu fixes