Menu and language fixes