SetupWizard: Re-order li,ul html tags properly