Added locale
Added menu order