rearranged menu a bit