Made none translatable
Rearranged module order