Fix and add menu