Performance improvement to menu