Added official names
Added translations for official names.
Layout fix