clean up
fix locale ordering + hack for default locale
improve template