fixed menu structure + validation