reorganized menu entries

it was a bit too verbose with rules and headers, now made lighter