restructuration menu. c pa mal mintenan. merge soon