closes #318 for good one hopes

Moving countries out of the "optional section" for better UX