Menu improved