Menu improvment (internal)