cleanup UI, add country and currency checking