Added arabic fields and translations
fixed some views
fixed conflicts