rework on archi and add menu