diff --git a/application/language/de-CH/common_lang.php b/application/language/de-CH/common_lang.php
index 6f5022861..9c92e2d6f 100644
--- a/application/language/de-CH/common_lang.php
+++ b/application/language/de-CH/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Voller Dateipfad zum Excel File notwendig";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Erforderlich";
-$lang["common_days_sunday"] = "Sonntag";
-$lang["common_days_monday"] = "Montag";
-$lang["common_days_tueday"] = "Dienstag";
-$lang["common_days_wednesday"] = "Mittwoch";
-$lang["common_days_thursday"] = "Donnerstag";
-$lang["common_days_friday"] = "Freitag";
-$lang["common_days_saturday"] = "Samstag";
-$lang["common_daysshort_sunday"] = "Son";
-$lang["common_daysshort_monday"] = "Mon";
-$lang["common_daysshort_tueday"] = "Die";
-$lang["common_daysshort_wednesday"] = "Mit";
-$lang["common_daysshort_thursday"] = "Don";
-$lang["common_daysshort_friday"] = "Fre";
-$lang["common_daysshort_saturday"] = "Sam";
-$lang["common_daysmin_sunday"] = "So";
-$lang["common_daysmin_monday"] = "Mo";
-$lang["common_daysmin_tueday"] = "Di";
-$lang["common_daysmin_wednesday"] = "Mi";
-$lang["common_daysmin_thursday"] = "Do";
-$lang["common_daysmin_friday"] = "Fr";
-$lang["common_daysmin_saturday"] = "Sa";
-$lang["common_months_january"] = "Januar";
-$lang["common_months_february"] = "Februar";
-$lang["common_months_march"] = "M�rz";
-$lang["common_months_april"] = "April";
-$lang["common_months_may"] = "Mai";
-$lang["common_months_june"] = "Juni";
-$lang["common_months_july"] = "Juli";
-$lang["common_months_august"] = "August";
-$lang["common_months_september"] = "September";
-$lang["common_months_october"] = "Oktober";
-$lang["common_months_november"] = "November";
-$lang["common_months_december"] = "Dezember";
-$lang["common_monthsshort_january"] = "Jan";
-$lang["common_monthsshort_february"] = "Feb";
-$lang["common_monthsshort_march"] = "M�r";
-$lang["common_monthsshort_april"] = "Apr";
-$lang["common_monthsshort_may"] = "Mai";
-$lang["common_monthsshort_june"] = "Jun";
-$lang["common_monthsshort_july"] = "Jul";
-$lang["common_monthsshort_august"] = "Aug";
-$lang["common_monthsshort_september"] = "Sep";
-$lang["common_monthsshort_october"] = "Okt";
-$lang["common_monthsshort_november"] = "Nov";
-$lang["common_monthsshort_december"] = "Dez";
-$lang["common_today"] = "Heute";
-$lang["common_weekstart"] = "1";
diff --git a/application/language/de-CH/datepicker_lang.php b/application/language/de-CH/datepicker_lang.php
new file mode 100644
index 000000000..ddf39879e
--- /dev/null
+++ b/application/language/de-CH/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "Sonntag";
+$lang["datepicker_days_monday"] = "Montag";
+$lang["datepicker_days_tueday"] = "Dienstag";
+$lang["datepicker_days_wednesday"] = "Mittwoch";
+$lang["datepicker_days_thursday"] = "Donnerstag";
+$lang["datepicker_days_friday"] = "Freitag";
+$lang["datepicker_days_saturday"] = "Samstag";
+$lang["datepicker_daysshort_sunday"] = "Son";
+$lang["datepicker_daysshort_monday"] = "Mon";
+$lang["datepicker_daysshort_tueday"] = "Die";
+$lang["datepicker_daysshort_wednesday"] = "Mit";
+$lang["datepicker_daysshort_thursday"] = "Don";
+$lang["datepicker_daysshort_friday"] = "Fre";
+$lang["datepicker_daysshort_saturday"] = "Sam";
+$lang["datepicker_daysmin_sunday"] = "So";
+$lang["datepicker_daysmin_monday"] = "Mo";
+$lang["datepicker_daysmin_tueday"] = "Di";
+$lang["datepicker_daysmin_wednesday"] = "Mi";
+$lang["datepicker_daysmin_thursday"] = "Do";
+$lang["datepicker_daysmin_friday"] = "Fr";
+$lang["datepicker_daysmin_saturday"] = "Sa";
+$lang["datepicker_months_january"] = "Januar";
+$lang["datepicker_months_february"] = "Februar";
+$lang["datepicker_months_march"] = "M�rz";
+$lang["datepicker_months_april"] = "April";
+$lang["datepicker_months_may"] = "Mai";
+$lang["datepicker_months_june"] = "Juni";
+$lang["datepicker_months_july"] = "Juli";
+$lang["datepicker_months_august"] = "August";
+$lang["datepicker_months_september"] = "September";
+$lang["datepicker_months_october"] = "Oktober";
+$lang["datepicker_months_november"] = "November";
+$lang["datepicker_months_december"] = "Dezember";
+$lang["datepicker_monthsshort_january"] = "Jan";
+$lang["datepicker_monthsshort_february"] = "Feb";
+$lang["datepicker_monthsshort_march"] = "M�r";
+$lang["datepicker_monthsshort_april"] = "Apr";
+$lang["datepicker_monthsshort_may"] = "Mai";
+$lang["datepicker_monthsshort_june"] = "Jun";
+$lang["datepicker_monthsshort_july"] = "Jul";
+$lang["datepicker_monthsshort_august"] = "Aug";
+$lang["datepicker_monthsshort_september"] = "Sep";
+$lang["datepicker_monthsshort_october"] = "Okt";
+$lang["datepicker_monthsshort_november"] = "Nov";
+$lang["datepicker_monthsshort_december"] = "Dez";
+$lang["datepicker_today"] = "Heute";
+$lang["datepicker_weekstart"] = "1";
diff --git a/application/language/en/common_lang.php b/application/language/en/common_lang.php
index 1086cdb5f..dc8edcfc3 100644
--- a/application/language/en/common_lang.php
+++ b/application/language/en/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "Select file";
 $lang["common_import_change_file"] = "Change";
 $lang["common_import_remove_file"] = "Remove";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
-$lang["common_days_sunday"] = "Sunday";
-$lang["common_days_monday"] = "Monday";
-$lang["common_days_tueday"] = "Tuesday";
-$lang["common_days_wednesday"] = "Wednesday";
-$lang["common_days_thursday"] = "Thursday";
-$lang["common_days_friday"] = "Friday";
-$lang["common_days_saturday"] = "Saturday";
-$lang["common_daysshort_sunday"] = "Sun";
-$lang["common_daysshort_monday"] = "Mon";
-$lang["common_daysshort_tueday"] = "Tue";
-$lang["common_daysshort_wednesday"] = "Wed";
-$lang["common_daysshort_thursday"] = "Thu";
-$lang["common_daysshort_friday"] = "Fri";
-$lang["common_daysshort_saturday"] = "Sat";
-$lang["common_daysmin_sunday"] = "Su";
-$lang["common_daysmin_monday"] = "Mo";
-$lang["common_daysmin_tueday"] = "Tu";
-$lang["common_daysmin_wednesday"] = "We";
-$lang["common_daysmin_thursday"] = "Th";
-$lang["common_daysmin_friday"] = "Fr";
-$lang["common_daysmin_saturday"] = "Sa";
-$lang["common_months_january"] = "January";
-$lang["common_months_february"] = "February";
-$lang["common_months_march"] = "March";
-$lang["common_months_april"] = "April";
-$lang["common_months_may"] = "May";
-$lang["common_months_june"] = "June";
-$lang["common_months_july"] = "July";
-$lang["common_months_august"] = "August";
-$lang["common_months_september"] = "September";
-$lang["common_months_october"] = "October";
-$lang["common_months_november"] = "November";
-$lang["common_months_december"] = "December";
-$lang["common_monthsshort_january"] = "Jan";
-$lang["common_monthsshort_february"] = "Feb";
-$lang["common_monthsshort_march"] = "Mar";
-$lang["common_monthsshort_april"] = "Apr";
-$lang["common_monthsshort_may"] = "May";
-$lang["common_monthsshort_june"] = "Jun";
-$lang["common_monthsshort_july"] = "Jul";
-$lang["common_monthsshort_august"] = "Aug";
-$lang["common_monthsshort_september"] = "Sep";
-$lang["common_monthsshort_october"] = "Oct";
-$lang["common_monthsshort_november"] = "Nov";
-$lang["common_monthsshort_december"] = "Dec";
-$lang["common_today"] = "Today";
-$lang["common_weekstart"] = "0";
diff --git a/application/language/en/datepicker_lang.php b/application/language/en/datepicker_lang.php
new file mode 100644
index 000000000..24f77b060
--- /dev/null
+++ b/application/language/en/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "Sunday";
+$lang["datepicker_days_monday"] = "Monday";
+$lang["datepicker_days_tueday"] = "Tuesday";
+$lang["datepicker_days_wednesday"] = "Wednesday";
+$lang["datepicker_days_thursday"] = "Thursday";
+$lang["datepicker_days_friday"] = "Friday";
+$lang["datepicker_days_saturday"] = "Saturday";
+$lang["datepicker_daysshort_sunday"] = "Sun";
+$lang["datepicker_daysshort_monday"] = "Mon";
+$lang["datepicker_daysshort_tueday"] = "Tue";
+$lang["datepicker_daysshort_wednesday"] = "Wed";
+$lang["datepicker_daysshort_thursday"] = "Thu";
+$lang["datepicker_daysshort_friday"] = "Fri";
+$lang["datepicker_daysshort_saturday"] = "Sat";
+$lang["datepicker_daysmin_sunday"] = "Su";
+$lang["datepicker_daysmin_monday"] = "Mo";
+$lang["datepicker_daysmin_tueday"] = "Tu";
+$lang["datepicker_daysmin_wednesday"] = "We";
+$lang["datepicker_daysmin_thursday"] = "Th";
+$lang["datepicker_daysmin_friday"] = "Fr";
+$lang["datepicker_daysmin_saturday"] = "Sa";
+$lang["datepicker_months_january"] = "January";
+$lang["datepicker_months_february"] = "February";
+$lang["datepicker_months_march"] = "March";
+$lang["datepicker_months_april"] = "April";
+$lang["datepicker_months_may"] = "May";
+$lang["datepicker_months_june"] = "June";
+$lang["datepicker_months_july"] = "July";
+$lang["datepicker_months_august"] = "August";
+$lang["datepicker_months_september"] = "September";
+$lang["datepicker_months_october"] = "October";
+$lang["datepicker_months_november"] = "November";
+$lang["datepicker_months_december"] = "December";
+$lang["datepicker_monthsshort_january"] = "Jan";
+$lang["datepicker_monthsshort_february"] = "Feb";
+$lang["datepicker_monthsshort_march"] = "Mar";
+$lang["datepicker_monthsshort_april"] = "Apr";
+$lang["datepicker_monthsshort_may"] = "May";
+$lang["datepicker_monthsshort_june"] = "Jun";
+$lang["datepicker_monthsshort_july"] = "Jul";
+$lang["datepicker_monthsshort_august"] = "Aug";
+$lang["datepicker_monthsshort_september"] = "Sep";
+$lang["datepicker_monthsshort_october"] = "Oct";
+$lang["datepicker_monthsshort_november"] = "Nov";
+$lang["datepicker_monthsshort_december"] = "Dec";
+$lang["datepicker_today"] = "Today";
+$lang["datepicker_weekstart"] = "0";
diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php
index 565ddc12d..3d31a0da9 100644
--- a/application/language/es/common_lang.php
+++ b/application/language/es/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Requerida la ruta completa del archivo";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Requerido";
-$lang["common_days_sunday"] = "Domingo";
-$lang["common_days_monday"] = "Lunes";
-$lang["common_days_tueday"] = "Martes";
-$lang["common_days_wednesday"] = "Mi�rcoles";
-$lang["common_days_thursday"] = "Jueves";
-$lang["common_days_friday"] = "Viernes";
-$lang["common_days_saturday"] = "S�bado";
-$lang["common_daysshort_sunday"] = "Dom";
-$lang["common_daysshort_monday"] = "Lun";
-$lang["common_daysshort_tueday"] = "Mar";
-$lang["common_daysshort_wednesday"] = "Mi�";
-$lang["common_daysshort_thursday"] = "Jue";
-$lang["common_daysshort_friday"] = "Vie";
-$lang["common_daysshort_saturday"] = "S�b";
-$lang["common_daysmin_sunday"] = "Do";
-$lang["common_daysmin_monday"] = "Lu";
-$lang["common_daysmin_tueday"] = "Ma";
-$lang["common_daysmin_wednesday"] = "Mi";
-$lang["common_daysmin_thursday"] = "Ju";
-$lang["common_daysmin_friday"] = "Vi";
-$lang["common_daysmin_saturday"] = "Sa";
-$lang["common_months_january"] = "Enero";
-$lang["common_months_february"] = "Febrero";
-$lang["common_months_march"] = "Marzo";
-$lang["common_months_april"] = "Abril";
-$lang["common_months_may"] = "Mayo";
-$lang["common_months_june"] = "Junio";
-$lang["common_months_july"] = "Julio";
-$lang["common_months_august"] = "Agosto";
-$lang["common_months_september"] = "Septiembre";
-$lang["common_months_october"] = "Octubre";
-$lang["common_months_november"] = "Noviembre";
-$lang["common_months_december"] = "Diciembre";
-$lang["common_monthsshort_january"] = "Ene";
-$lang["common_monthsshort_february"] = "Feb";
-$lang["common_monthsshort_march"] = "Mar";
-$lang["common_monthsshort_april"] = "Abr";
-$lang["common_monthsshort_may"] = "May";
-$lang["common_monthsshort_june"] = "Jun";
-$lang["common_monthsshort_july"] = "Jul";
-$lang["common_monthsshort_august"] = "Ago";
-$lang["common_monthsshort_september"] = "Sep";
-$lang["common_monthsshort_october"] = "Oct";
-$lang["common_monthsshort_november"] = "Nov";
-$lang["common_monthsshort_december"] = "Dic";
-$lang["common_today"] = "Hoy";
-$lang["common_weekstart"] = "0";
diff --git a/application/language/es/datepicker_lang.php b/application/language/es/datepicker_lang.php
new file mode 100644
index 000000000..3f64af2b2
--- /dev/null
+++ b/application/language/es/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "Domingo";
+$lang["datepicker_days_monday"] = "Lunes";
+$lang["datepicker_days_tueday"] = "Martes";
+$lang["datepicker_days_wednesday"] = "Mi�rcoles";
+$lang["datepicker_days_thursday"] = "Jueves";
+$lang["datepicker_days_friday"] = "Viernes";
+$lang["datepicker_days_saturday"] = "S�bado";
+$lang["datepicker_daysshort_sunday"] = "Dom";
+$lang["datepicker_daysshort_monday"] = "Lun";
+$lang["datepicker_daysshort_tueday"] = "Mar";
+$lang["datepicker_daysshort_wednesday"] = "Mi�";
+$lang["datepicker_daysshort_thursday"] = "Jue";
+$lang["datepicker_daysshort_friday"] = "Vie";
+$lang["datepicker_daysshort_saturday"] = "S�b";
+$lang["datepicker_daysmin_sunday"] = "Do";
+$lang["datepicker_daysmin_monday"] = "Lu";
+$lang["datepicker_daysmin_tueday"] = "Ma";
+$lang["datepicker_daysmin_wednesday"] = "Mi";
+$lang["datepicker_daysmin_thursday"] = "Ju";
+$lang["datepicker_daysmin_friday"] = "Vi";
+$lang["datepicker_daysmin_saturday"] = "Sa";
+$lang["datepicker_months_january"] = "Enero";
+$lang["datepicker_months_february"] = "Febrero";
+$lang["datepicker_months_march"] = "Marzo";
+$lang["datepicker_months_april"] = "Abril";
+$lang["datepicker_months_may"] = "Mayo";
+$lang["datepicker_months_june"] = "Junio";
+$lang["datepicker_months_july"] = "Julio";
+$lang["datepicker_months_august"] = "Agosto";
+$lang["datepicker_months_september"] = "Septiembre";
+$lang["datepicker_months_october"] = "Octubre";
+$lang["datepicker_months_november"] = "Noviembre";
+$lang["datepicker_months_december"] = "Diciembre";
+$lang["datepicker_monthsshort_january"] = "Ene";
+$lang["datepicker_monthsshort_february"] = "Feb";
+$lang["datepicker_monthsshort_march"] = "Mar";
+$lang["datepicker_monthsshort_april"] = "Abr";
+$lang["datepicker_monthsshort_may"] = "May";
+$lang["datepicker_monthsshort_june"] = "Jun";
+$lang["datepicker_monthsshort_july"] = "Jul";
+$lang["datepicker_monthsshort_august"] = "Ago";
+$lang["datepicker_monthsshort_september"] = "Sep";
+$lang["datepicker_monthsshort_october"] = "Oct";
+$lang["datepicker_monthsshort_november"] = "Nov";
+$lang["datepicker_monthsshort_december"] = "Dic";
+$lang["datepicker_today"] = "Hoy";
+$lang["datepicker_weekstart"] = "0";
diff --git a/application/language/fr/common_lang.php b/application/language/fr/common_lang.php
index 4471688be..142cdb416 100644
--- a/application/language/fr/common_lang.php
+++ b/application/language/fr/common_lang.php
@@ -27,7 +27,7 @@ $lang["common_last_name_required"] = "Le nom est requis";
 $lang["common_last_page"] = "Last";
 $lang["common_learn_about_project"] = "pour les dernières informations sur le projet";
 $lang["common_list_of"] = "Liste de";
-$lang["common_logout"] = "Déconnexion";
+$lang["common_logout"] = "Déconnion";
 $lang["common_new"] = "New";
 $lang["common_no_persons_to_display"] = "Il n\'y a personne à afficher";
 $lang["common_or"] = "OU";
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
-$lang["common_days_sunday"] = "Dimanche";
-$lang["common_days_monday"] = "Lundi";
-$lang["common_days_tueday"] = "Mardi";
-$lang["common_days_wednesday"] = "Mercredi";
-$lang["common_days_thursday"] = "Jeudi";
-$lang["common_days_friday"] = "Vendredi";
-$lang["common_days_saturday"] = "Samedi";
-$lang["common_daysshort_sunday"] = "Dim";
-$lang["common_daysshort_monday"] = "Lun";
-$lang["common_daysshort_tueday"] = "Mar";
-$lang["common_daysshort_wednesday"] = "Mer";
-$lang["common_daysshort_thursday"] = "Jeu";
-$lang["common_daysshort_friday"] = "Ven";
-$lang["common_daysshort_saturday"] = "Sam";
-$lang["common_daysmin_sunday"] = "D";
-$lang["common_daysmin_monday"] = "L";
-$lang["common_daysmin_tueday"] = "Ma";
-$lang["common_daysmin_wednesday"] = "Me";
-$lang["common_daysmin_thursday"] = "J";
-$lang["common_daysmin_friday"] = "V";
-$lang["common_daysmin_saturday"] = "S";
-$lang["common_months_january"] = "Janvier";
-$lang["common_months_february"] = "F�vrier";
-$lang["common_months_march"] = "Mars";
-$lang["common_months_april"] = "Avril";
-$lang["common_months_may"] = "Mai";
-$lang["common_months_june"] = "Juin";
-$lang["common_months_july"] = "Juillet";
-$lang["common_months_august"] = "Ao�t";
-$lang["common_months_september"] = "Septembre";
-$lang["common_months_october"] = "Octobre";
-$lang["common_months_november"] = "Novembre";
-$lang["common_months_december"] = "D�cembre";
-$lang["common_monthsshort_january"] = "Jan";
-$lang["common_monthsshort_february"] = "F�v";
-$lang["common_monthsshort_march"] = "Mar";
-$lang["common_monthsshort_april"] = "Avr";
-$lang["common_monthsshort_may"] = "Mai";
-$lang["common_monthsshort_june"] = "Jui";
-$lang["common_monthsshort_july"] = "Jui";
-$lang["common_monthsshort_august"] = "Ao�";
-$lang["common_monthsshort_september"] = "Sep";
-$lang["common_monthsshort_october"] = "Oct";
-$lang["common_monthsshort_november"] = "Nov";
-$lang["common_monthsshort_december"] = "Dec";
-$lang["common_today"] = "Aujourd'hui";
-$lang["common_weekstart"] = "1";
diff --git a/application/language/fr/datepicker_lang.php b/application/language/fr/datepicker_lang.php
new file mode 100644
index 000000000..e1bdb0999
--- /dev/null
+++ b/application/language/fr/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "Dimanche";
+$lang["datepicker_days_monday"] = "Lundi";
+$lang["datepicker_days_tueday"] = "Mardi";
+$lang["datepicker_days_wednesday"] = "Mercredi";
+$lang["datepicker_days_thursday"] = "Jeudi";
+$lang["datepicker_days_friday"] = "Vendredi";
+$lang["datepicker_days_saturday"] = "Samedi";
+$lang["datepicker_daysshort_sunday"] = "Dim";
+$lang["datepicker_daysshort_monday"] = "Lun";
+$lang["datepicker_daysshort_tueday"] = "Mar";
+$lang["datepicker_daysshort_wednesday"] = "Mer";
+$lang["datepicker_daysshort_thursday"] = "Jeu";
+$lang["datepicker_daysshort_friday"] = "Ven";
+$lang["datepicker_daysshort_saturday"] = "Sam";
+$lang["datepicker_daysmin_sunday"] = "D";
+$lang["datepicker_daysmin_monday"] = "L";
+$lang["datepicker_daysmin_tueday"] = "Ma";
+$lang["datepicker_daysmin_wednesday"] = "Me";
+$lang["datepicker_daysmin_thursday"] = "J";
+$lang["datepicker_daysmin_friday"] = "V";
+$lang["datepicker_daysmin_saturday"] = "S";
+$lang["datepicker_months_january"] = "Janvier";
+$lang["datepicker_months_february"] = "F�vrier";
+$lang["datepicker_months_march"] = "Mars";
+$lang["datepicker_months_april"] = "Avril";
+$lang["datepicker_months_may"] = "Mai";
+$lang["datepicker_months_june"] = "Juin";
+$lang["datepicker_months_july"] = "Juillet";
+$lang["datepicker_months_august"] = "Ao�t";
+$lang["datepicker_months_september"] = "Septembre";
+$lang["datepicker_months_october"] = "Octobre";
+$lang["datepicker_months_november"] = "Novembre";
+$lang["datepicker_months_december"] = "D�cembre";
+$lang["datepicker_monthsshort_january"] = "Jan";
+$lang["datepicker_monthsshort_february"] = "F�v";
+$lang["datepicker_monthsshort_march"] = "Mar";
+$lang["datepicker_monthsshort_april"] = "Avr";
+$lang["datepicker_monthsshort_may"] = "Mai";
+$lang["datepicker_monthsshort_june"] = "Jui";
+$lang["datepicker_monthsshort_july"] = "Jui";
+$lang["datepicker_monthsshort_august"] = "Ao�";
+$lang["datepicker_monthsshort_september"] = "Sep";
+$lang["datepicker_monthsshort_october"] = "Oct";
+$lang["datepicker_monthsshort_november"] = "Nov";
+$lang["datepicker_monthsshort_december"] = "Dec";
+$lang["datepicker_today"] = "Aujourd'hui";
+$lang["datepicker_weekstart"] = "1";
diff --git a/application/language/id/common_lang.php b/application/language/id/common_lang.php
index 9dd343e6f..6b8401901 100644
--- a/application/language/id/common_lang.php
+++ b/application/language/id/common_lang.php
@@ -5,7 +5,7 @@ $lang["common_address_2"] = "Alamat 2";
 $lang["common_city"] = "Kota";
 $lang["common_comments"] = "Catatan";
 $lang["common_common"] = "Biasa";
-$lang["common_confirm_search"] = "Anda telah memilih satu atau lebih baris, ini tidak akan lagi dipilih setelah pencarian Anda. Apakah Anda yakin ingin mengirimkan pencarian ini?\"";
+$lang["common_confirm_search"] = "Anda telah memilih satu atau lebih baris, ini tidak akan lagi dipilih setelah pencarian Anda. Apakah Anda yakin ingin mengirimkan pencarian ini?";
 $lang["common_country"] = "Negara";
 $lang["common_date"] = "Date";
 $lang["common_delete"] = "Hapus";
@@ -46,7 +46,7 @@ $lang["common_submit"] = "Kirim";
 $lang["common_view_recent_sales"] = "Lihat Penjualan Terkini";
 $lang["common_website"] = "Situs";
 $lang["common_welcome"] = "Selamat Datang";
-$lang["common_welcome_message"] = "Selamat Datang, klik modul di bawah ini untuk memulai\"";
+$lang["common_welcome_message"] = "Selamat Datang, klik modul di bawah ini untuk memulai";
 $lang["common_you_are_using_ospos"] = "Anda menggunakan Open Source Point Of Sale Versi";
 $lang["common_zip"] = "Kode POS";
 $lang["common_import"] = "Import";
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
-$lang["common_days_sunday"] = "";
-$lang["common_days_monday"] = "";
-$lang["common_days_tueday"] = "";
-$lang["common_days_wednesday"] = "";
-$lang["common_days_thursday"] = "";
-$lang["common_days_friday"] = "";
-$lang["common_days_saturday"] = "";
-$lang["common_daysshort_sunday"] = "";
-$lang["common_daysshort_monday"] = "";
-$lang["common_daysshort_tueday"] = "";
-$lang["common_daysshort_wednesday"] = "";
-$lang["common_daysshort_thursday"] = "";
-$lang["common_daysshort_friday"] = "";
-$lang["common_daysshort_saturday"] = "";
-$lang["common_daysmin_sunday"] = "";
-$lang["common_daysmin_monday"] = "";
-$lang["common_daysmin_tueday"] = "";
-$lang["common_daysmin_wednesday"] = "";
-$lang["common_daysmin_thursday"] = "";
-$lang["common_daysmin_friday"] = "";
-$lang["common_daysmin_saturday"] = "";
-$lang["common_months_january"] = "";
-$lang["common_months_february"] = "";
-$lang["common_months_march"] = "";
-$lang["common_months_april"] = "";
-$lang["common_months_may"] = "";
-$lang["common_months_june"] = "";
-$lang["common_months_july"] = "";
-$lang["common_months_august"] = "";
-$lang["common_months_september"] = "";
-$lang["common_months_october"] = "";
-$lang["common_months_november"] = "";
-$lang["common_months_december"] = "";
-$lang["common_monthsshort_january"] = "";
-$lang["common_monthsshort_february"] = "";
-$lang["common_monthsshort_march"] = "";
-$lang["common_monthsshort_april"] = "";
-$lang["common_monthsshort_may"] = "";
-$lang["common_monthsshort_june"] = "";
-$lang["common_monthsshort_july"] = "";
-$lang["common_monthsshort_august"] = "";
-$lang["common_monthsshort_september"] = "";
-$lang["common_monthsshort_october"] = "";
-$lang["common_monthsshort_november"] = "";
-$lang["common_monthsshort_december"] = "";
-$lang["common_today"] = "";
-$lang["common_weekstart"] = "";
diff --git a/application/language/id/datepicker_lang.php b/application/language/id/datepicker_lang.php
new file mode 100644
index 000000000..1b4eace1e
--- /dev/null
+++ b/application/language/id/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "";
+$lang["datepicker_days_monday"] = "";
+$lang["datepicker_days_tueday"] = "";
+$lang["datepicker_days_wednesday"] = "";
+$lang["datepicker_days_thursday"] = "";
+$lang["datepicker_days_friday"] = "";
+$lang["datepicker_days_saturday"] = "";
+$lang["datepicker_daysshort_sunday"] = "";
+$lang["datepicker_daysshort_monday"] = "";
+$lang["datepicker_daysshort_tueday"] = "";
+$lang["datepicker_daysshort_wednesday"] = "";
+$lang["datepicker_daysshort_thursday"] = "";
+$lang["datepicker_daysshort_friday"] = "";
+$lang["datepicker_daysshort_saturday"] = "";
+$lang["datepicker_daysmin_sunday"] = "";
+$lang["datepicker_daysmin_monday"] = "";
+$lang["datepicker_daysmin_tueday"] = "";
+$lang["datepicker_daysmin_wednesday"] = "";
+$lang["datepicker_daysmin_thursday"] = "";
+$lang["datepicker_daysmin_friday"] = "";
+$lang["datepicker_daysmin_saturday"] = "";
+$lang["datepicker_months_january"] = "";
+$lang["datepicker_months_february"] = "";
+$lang["datepicker_months_march"] = "";
+$lang["datepicker_months_april"] = "";
+$lang["datepicker_months_may"] = "";
+$lang["datepicker_months_june"] = "";
+$lang["datepicker_months_july"] = "";
+$lang["datepicker_months_august"] = "";
+$lang["datepicker_months_september"] = "";
+$lang["datepicker_months_october"] = "";
+$lang["datepicker_months_november"] = "";
+$lang["datepicker_months_december"] = "";
+$lang["datepicker_monthsshort_january"] = "";
+$lang["datepicker_monthsshort_february"] = "";
+$lang["datepicker_monthsshort_march"] = "";
+$lang["datepicker_monthsshort_april"] = "";
+$lang["datepicker_monthsshort_may"] = "";
+$lang["datepicker_monthsshort_june"] = "";
+$lang["datepicker_monthsshort_july"] = "";
+$lang["datepicker_monthsshort_august"] = "";
+$lang["datepicker_monthsshort_september"] = "";
+$lang["datepicker_monthsshort_october"] = "";
+$lang["datepicker_monthsshort_november"] = "";
+$lang["datepicker_monthsshort_december"] = "";
+$lang["datepicker_today"] = "";
+$lang["datepicker_weekstart"] = "";
diff --git a/application/language/nl-BE/common_lang.php b/application/language/nl-BE/common_lang.php
index 41921f5d5..b60d6878c 100755
--- a/application/language/nl-BE/common_lang.php
+++ b/application/language/nl-BE/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
-$lang["common_days_sunday"] = "Zondag";
-$lang["common_days_monday"] = "Maandag";
-$lang["common_days_tueday"] = "Dinsdag";
-$lang["common_days_wednesday"] = "Woensdag";
-$lang["common_days_thursday"] = "Donderdag";
-$lang["common_days_friday"] = "Vrijdag";
-$lang["common_days_saturday"] = "Zaterdag";
-$lang["common_daysshort_sunday"] = "Zo";
-$lang["common_daysshort_monday"] = "Ma";
-$lang["common_daysshort_tueday"] = "Di";
-$lang["common_daysshort_wednesday"] = "Wo";
-$lang["common_daysshort_thursday"] = "Do";
-$lang["common_daysshort_friday"] = "Vr";
-$lang["common_daysshort_saturday"] = "Za";
-$lang["common_daysmin_sunday"] = "Zo";
-$lang["common_daysmin_monday"] = "Ma";
-$lang["common_daysmin_tueday"] = "Di";
-$lang["common_daysmin_wednesday"] = "Wo";
-$lang["common_daysmin_thursday"] = "Do";
-$lang["common_daysmin_friday"] = "Vr";
-$lang["common_daysmin_saturday"] = "Za";
-$lang["common_months_january"] = "Januari";
-$lang["common_months_february"] = "Februari";
-$lang["common_months_march"] = "Maart";
-$lang["common_months_april"] = "April";
-$lang["common_months_may"] = "Mei";
-$lang["common_months_june"] = "Juni";
-$lang["common_months_july"] = "Juli";
-$lang["common_months_august"] = "Augustus";
-$lang["common_months_september"] = "September";
-$lang["common_months_october"] = "Oktober";
-$lang["common_months_november"] = "November";
-$lang["common_months_december"] = "December";
-$lang["common_monthsshort_january"] = "Jan";
-$lang["common_monthsshort_february"] = "Feb";
-$lang["common_monthsshort_march"] = "Mrt";
-$lang["common_monthsshort_april"] = "Apr";
-$lang["common_monthsshort_may"] = "Mei";
-$lang["common_monthsshort_june"] = "Jun";
-$lang["common_monthsshort_july"] = "Jul";
-$lang["common_monthsshort_august"] = "Aug";
-$lang["common_monthsshort_september"] = "Sep";
-$lang["common_monthsshort_october"] = "Okt";
-$lang["common_monthsshort_november"] = "Nov";
-$lang["common_monthsshort_december"] = "Dec";
-$lang["common_today"] = "Vandaag";
-$lang["common_weekstart"] = "0";
diff --git a/application/language/nl-BE/datepicker_lang.php b/application/language/nl-BE/datepicker_lang.php
new file mode 100644
index 000000000..aead0f1c2
--- /dev/null
+++ b/application/language/nl-BE/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "Zondag";
+$lang["datepicker_days_monday"] = "Maandag";
+$lang["datepicker_days_tueday"] = "Dinsdag";
+$lang["datepicker_days_wednesday"] = "Woensdag";
+$lang["datepicker_days_thursday"] = "Donderdag";
+$lang["datepicker_days_friday"] = "Vrijdag";
+$lang["datepicker_days_saturday"] = "Zaterdag";
+$lang["datepicker_daysshort_sunday"] = "Zo";
+$lang["datepicker_daysshort_monday"] = "Ma";
+$lang["datepicker_daysshort_tueday"] = "Di";
+$lang["datepicker_daysshort_wednesday"] = "Wo";
+$lang["datepicker_daysshort_thursday"] = "Do";
+$lang["datepicker_daysshort_friday"] = "Vr";
+$lang["datepicker_daysshort_saturday"] = "Za";
+$lang["datepicker_daysmin_sunday"] = "Zo";
+$lang["datepicker_daysmin_monday"] = "Ma";
+$lang["datepicker_daysmin_tueday"] = "Di";
+$lang["datepicker_daysmin_wednesday"] = "Wo";
+$lang["datepicker_daysmin_thursday"] = "Do";
+$lang["datepicker_daysmin_friday"] = "Vr";
+$lang["datepicker_daysmin_saturday"] = "Za";
+$lang["datepicker_months_january"] = "Januari";
+$lang["datepicker_months_february"] = "Februari";
+$lang["datepicker_months_march"] = "Maart";
+$lang["datepicker_months_april"] = "April";
+$lang["datepicker_months_may"] = "Mei";
+$lang["datepicker_months_june"] = "Juni";
+$lang["datepicker_months_july"] = "Juli";
+$lang["datepicker_months_august"] = "Augustus";
+$lang["datepicker_months_september"] = "September";
+$lang["datepicker_months_october"] = "Oktober";
+$lang["datepicker_months_november"] = "November";
+$lang["datepicker_months_december"] = "December";
+$lang["datepicker_monthsshort_january"] = "Jan";
+$lang["datepicker_monthsshort_february"] = "Feb";
+$lang["datepicker_monthsshort_march"] = "Mrt";
+$lang["datepicker_monthsshort_april"] = "Apr";
+$lang["datepicker_monthsshort_may"] = "Mei";
+$lang["datepicker_monthsshort_june"] = "Jun";
+$lang["datepicker_monthsshort_july"] = "Jul";
+$lang["datepicker_monthsshort_august"] = "Aug";
+$lang["datepicker_monthsshort_september"] = "Sep";
+$lang["datepicker_monthsshort_october"] = "Okt";
+$lang["datepicker_monthsshort_november"] = "Nov";
+$lang["datepicker_monthsshort_december"] = "Dec";
+$lang["datepicker_today"] = "Vandaag";
+$lang["datepicker_weekstart"] = "0";
diff --git a/application/language/nl-BE/employees_lang.php b/application/language/nl-BE/employees_lang.php
index 6d903e0dc..c3da00f98 100755
--- a/application/language/nl-BE/employees_lang.php
+++ b/application/language/nl-BE/employees_lang.php
@@ -1,13 +1,13 @@
 <?php 
 
-$lang["employees_basic_information"] = "Employee Basic Information";
+$lang["employees_basic_information"] = "Information";
 $lang["employees_cannot_be_deleted"] = "Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)";
 $lang["employees_confirm_delete"] = "Bent u zeker dat u de geselecteerde werknemers wil verwijderen?";
 $lang["employees_employee"] = "Werknemer";
 $lang["employees_error_adding_updating"] = "Error adding/updating employee";
 $lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user";
 $lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user";
-$lang["employees_login_info"] = "Employee Login Info";
+$lang["employees_login_info"] = "Login";
 $lang["employees_new"] = "N. Werknemer";
 $lang["employees_none_selected"] = "U hebt geen werknemers geselecteerd";
 $lang["employees_one_or_multiple"] = "werknemer(s) verwijderd";
@@ -16,7 +16,7 @@ $lang["employees_password_minlength"] = "Paswoord moet minstens 8 characters lan
 $lang["employees_password_must_match"] = "Paswoorden komen niet overeen";
 $lang["employees_password_required"] = "Paswoord moet ingevuld worden";
 $lang["employees_permission_desc"] = "Check the boxes below to grant access to modules";
-$lang["employees_permission_info"] = "Employee Permissions and Access";
+$lang["employees_permission_info"] = "Permissions";
 $lang["employees_repeat_password"] = "Herhaal Paswoord";
 $lang["employees_successful_adding"] = "You have successfully added employee";
 $lang["employees_successful_deleted"] = "Er werd(en)";
diff --git a/application/language/ru/common_lang.php b/application/language/ru/common_lang.php
index abec81889..45675ebf9 100644
--- a/application/language/ru/common_lang.php
+++ b/application/language/ru/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
-$lang["common_days_sunday"] = "";
-$lang["common_days_monday"] = "";
-$lang["common_days_tueday"] = "";
-$lang["common_days_wednesday"] = "";
-$lang["common_days_thursday"] = "";
-$lang["common_days_friday"] = "";
-$lang["common_days_saturday"] = "";
-$lang["common_daysshort_sunday"] = "";
-$lang["common_daysshort_monday"] = "";
-$lang["common_daysshort_tueday"] = "";
-$lang["common_daysshort_wednesday"] = "";
-$lang["common_daysshort_thursday"] = "";
-$lang["common_daysshort_friday"] = "";
-$lang["common_daysshort_saturday"] = "";
-$lang["common_daysmin_sunday"] = "";
-$lang["common_daysmin_monday"] = "";
-$lang["common_daysmin_tueday"] = "";
-$lang["common_daysmin_wednesday"] = "";
-$lang["common_daysmin_thursday"] = "";
-$lang["common_daysmin_friday"] = "";
-$lang["common_daysmin_saturday"] = "";
-$lang["common_months_january"] = "";
-$lang["common_months_february"] = "";
-$lang["common_months_march"] = "";
-$lang["common_months_april"] = "";
-$lang["common_months_may"] = "";
-$lang["common_months_june"] = "";
-$lang["common_months_july"] = "";
-$lang["common_months_august"] = "";
-$lang["common_months_september"] = "";
-$lang["common_months_october"] = "";
-$lang["common_months_november"] = "";
-$lang["common_months_december"] = "";
-$lang["common_monthsshort_january"] = "";
-$lang["common_monthsshort_february"] = "";
-$lang["common_monthsshort_march"] = "";
-$lang["common_monthsshort_april"] = "";
-$lang["common_monthsshort_may"] = "";
-$lang["common_monthsshort_june"] = "";
-$lang["common_monthsshort_july"] = "";
-$lang["common_monthsshort_august"] = "";
-$lang["common_monthsshort_september"] = "";
-$lang["common_monthsshort_october"] = "";
-$lang["common_monthsshort_november"] = "";
-$lang["common_monthsshort_december"] = "";
-$lang["common_today"] = "";
-$lang["common_weekstart"] = "";
diff --git a/application/language/ru/datepicker_lang.php b/application/language/ru/datepicker_lang.php
new file mode 100644
index 000000000..1b4eace1e
--- /dev/null
+++ b/application/language/ru/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "";
+$lang["datepicker_days_monday"] = "";
+$lang["datepicker_days_tueday"] = "";
+$lang["datepicker_days_wednesday"] = "";
+$lang["datepicker_days_thursday"] = "";
+$lang["datepicker_days_friday"] = "";
+$lang["datepicker_days_saturday"] = "";
+$lang["datepicker_daysshort_sunday"] = "";
+$lang["datepicker_daysshort_monday"] = "";
+$lang["datepicker_daysshort_tueday"] = "";
+$lang["datepicker_daysshort_wednesday"] = "";
+$lang["datepicker_daysshort_thursday"] = "";
+$lang["datepicker_daysshort_friday"] = "";
+$lang["datepicker_daysshort_saturday"] = "";
+$lang["datepicker_daysmin_sunday"] = "";
+$lang["datepicker_daysmin_monday"] = "";
+$lang["datepicker_daysmin_tueday"] = "";
+$lang["datepicker_daysmin_wednesday"] = "";
+$lang["datepicker_daysmin_thursday"] = "";
+$lang["datepicker_daysmin_friday"] = "";
+$lang["datepicker_daysmin_saturday"] = "";
+$lang["datepicker_months_january"] = "";
+$lang["datepicker_months_february"] = "";
+$lang["datepicker_months_march"] = "";
+$lang["datepicker_months_april"] = "";
+$lang["datepicker_months_may"] = "";
+$lang["datepicker_months_june"] = "";
+$lang["datepicker_months_july"] = "";
+$lang["datepicker_months_august"] = "";
+$lang["datepicker_months_september"] = "";
+$lang["datepicker_months_october"] = "";
+$lang["datepicker_months_november"] = "";
+$lang["datepicker_months_december"] = "";
+$lang["datepicker_monthsshort_january"] = "";
+$lang["datepicker_monthsshort_february"] = "";
+$lang["datepicker_monthsshort_march"] = "";
+$lang["datepicker_monthsshort_april"] = "";
+$lang["datepicker_monthsshort_may"] = "";
+$lang["datepicker_monthsshort_june"] = "";
+$lang["datepicker_monthsshort_july"] = "";
+$lang["datepicker_monthsshort_august"] = "";
+$lang["datepicker_monthsshort_september"] = "";
+$lang["datepicker_monthsshort_october"] = "";
+$lang["datepicker_monthsshort_november"] = "";
+$lang["datepicker_monthsshort_december"] = "";
+$lang["datepicker_today"] = "";
+$lang["datepicker_weekstart"] = "";
diff --git a/application/language/th/common_lang.php b/application/language/th/common_lang.php
index da52093b2..c7e6db8bb 100644
--- a/application/language/th/common_lang.php
+++ b/application/language/th/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "ต้องกรอก";
-$lang["common_days_sunday"] = "";
-$lang["common_days_monday"] = "";
-$lang["common_days_tueday"] = "";
-$lang["common_days_wednesday"] = "";
-$lang["common_days_thursday"] = "";
-$lang["common_days_friday"] = "";
-$lang["common_days_saturday"] = "";
-$lang["common_daysshort_sunday"] = "";
-$lang["common_daysshort_monday"] = "";
-$lang["common_daysshort_tueday"] = "";
-$lang["common_daysshort_wednesday"] = "";
-$lang["common_daysshort_thursday"] = "";
-$lang["common_daysshort_friday"] = "";
-$lang["common_daysshort_saturday"] = "";
-$lang["common_daysmin_sunday"] = "";
-$lang["common_daysmin_monday"] = "";
-$lang["common_daysmin_tueday"] = "";
-$lang["common_daysmin_wednesday"] = "";
-$lang["common_daysmin_thursday"] = "";
-$lang["common_daysmin_friday"] = "";
-$lang["common_daysmin_saturday"] = "";
-$lang["common_months_january"] = "";
-$lang["common_months_february"] = "";
-$lang["common_months_march"] = "";
-$lang["common_months_april"] = "";
-$lang["common_months_may"] = "";
-$lang["common_months_june"] = "";
-$lang["common_months_july"] = "";
-$lang["common_months_august"] = "";
-$lang["common_months_september"] = "";
-$lang["common_months_october"] = "";
-$lang["common_months_november"] = "";
-$lang["common_months_december"] = "";
-$lang["common_monthsshort_january"] = "";
-$lang["common_monthsshort_february"] = "";
-$lang["common_monthsshort_march"] = "";
-$lang["common_monthsshort_april"] = "";
-$lang["common_monthsshort_may"] = "";
-$lang["common_monthsshort_june"] = "";
-$lang["common_monthsshort_july"] = "";
-$lang["common_monthsshort_august"] = "";
-$lang["common_monthsshort_september"] = "";
-$lang["common_monthsshort_october"] = "";
-$lang["common_monthsshort_november"] = "";
-$lang["common_monthsshort_december"] = "";
-$lang["common_today"] = "";
-$lang["common_weekstart"] = "";
diff --git a/application/language/th/datepicker_lang.php b/application/language/th/datepicker_lang.php
new file mode 100644
index 000000000..1b4eace1e
--- /dev/null
+++ b/application/language/th/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "";
+$lang["datepicker_days_monday"] = "";
+$lang["datepicker_days_tueday"] = "";
+$lang["datepicker_days_wednesday"] = "";
+$lang["datepicker_days_thursday"] = "";
+$lang["datepicker_days_friday"] = "";
+$lang["datepicker_days_saturday"] = "";
+$lang["datepicker_daysshort_sunday"] = "";
+$lang["datepicker_daysshort_monday"] = "";
+$lang["datepicker_daysshort_tueday"] = "";
+$lang["datepicker_daysshort_wednesday"] = "";
+$lang["datepicker_daysshort_thursday"] = "";
+$lang["datepicker_daysshort_friday"] = "";
+$lang["datepicker_daysshort_saturday"] = "";
+$lang["datepicker_daysmin_sunday"] = "";
+$lang["datepicker_daysmin_monday"] = "";
+$lang["datepicker_daysmin_tueday"] = "";
+$lang["datepicker_daysmin_wednesday"] = "";
+$lang["datepicker_daysmin_thursday"] = "";
+$lang["datepicker_daysmin_friday"] = "";
+$lang["datepicker_daysmin_saturday"] = "";
+$lang["datepicker_months_january"] = "";
+$lang["datepicker_months_february"] = "";
+$lang["datepicker_months_march"] = "";
+$lang["datepicker_months_april"] = "";
+$lang["datepicker_months_may"] = "";
+$lang["datepicker_months_june"] = "";
+$lang["datepicker_months_july"] = "";
+$lang["datepicker_months_august"] = "";
+$lang["datepicker_months_september"] = "";
+$lang["datepicker_months_october"] = "";
+$lang["datepicker_months_november"] = "";
+$lang["datepicker_months_december"] = "";
+$lang["datepicker_monthsshort_january"] = "";
+$lang["datepicker_monthsshort_february"] = "";
+$lang["datepicker_monthsshort_march"] = "";
+$lang["datepicker_monthsshort_april"] = "";
+$lang["datepicker_monthsshort_may"] = "";
+$lang["datepicker_monthsshort_june"] = "";
+$lang["datepicker_monthsshort_july"] = "";
+$lang["datepicker_monthsshort_august"] = "";
+$lang["datepicker_monthsshort_september"] = "";
+$lang["datepicker_monthsshort_october"] = "";
+$lang["datepicker_monthsshort_november"] = "";
+$lang["datepicker_monthsshort_december"] = "";
+$lang["datepicker_today"] = "";
+$lang["datepicker_weekstart"] = "";
diff --git a/application/language/th/employees_lang.php b/application/language/th/employees_lang.php
index 7ec065852..b3d3f018f 100644
--- a/application/language/th/employees_lang.php
+++ b/application/language/th/employees_lang.php
@@ -7,7 +7,7 @@ $lang["employees_employee"] = "พนักงาน";
 $lang["employees_error_adding_updating"] = "การปรับปรุงข้อมูลผิดพลาด";
 $lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user";
 $lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user";
-$lang["employees_login_info"] = "Employee Login Info";
+$lang["employees_login_info"] = "Login";
 $lang["employees_new"] = "เพิ่มพนักงาน";
 $lang["employees_none_selected"] = "โปรดเลือกพนักงาน";
 $lang["employees_one_or_multiple"] = "พนักงาน";
@@ -16,7 +16,7 @@ $lang["employees_password_minlength"] = "รหัสผ่านต้องย
 $lang["employees_password_must_match"] = "รหัสผ่านไม่ตรงกัน";
 $lang["employees_password_required"] = "ต้องกรอกรหัสผ่าน";
 $lang["employees_permission_desc"] = "Check the boxes below to grant access to modules";
-$lang["employees_permission_info"] = "Employee Permissions and Access";
+$lang["employees_permission_info"] = "Permissions";
 $lang["employees_repeat_password"] = "Password Again";
 $lang["employees_successful_adding"] = "เพิ่มข้อมูลพนักงานเรียบร้อยแล้ว";
 $lang["employees_successful_deleted"] = "ลบข้อมูลสำเร็จ";
diff --git a/application/language/tr/common_lang.php b/application/language/tr/common_lang.php
index 4930464a8..cf8f5ebbf 100644
--- a/application/language/tr/common_lang.php
+++ b/application/language/tr/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
-$lang["common_days_sunday"] = "";
-$lang["common_days_monday"] = "";
-$lang["common_days_tueday"] = "";
-$lang["common_days_wednesday"] = "";
-$lang["common_days_thursday"] = "";
-$lang["common_days_friday"] = "";
-$lang["common_days_saturday"] = "";
-$lang["common_daysshort_sunday"] = "";
-$lang["common_daysshort_monday"] = "";
-$lang["common_daysshort_tueday"] = "";
-$lang["common_daysshort_wednesday"] = "";
-$lang["common_daysshort_thursday"] = "";
-$lang["common_daysshort_friday"] = "";
-$lang["common_daysshort_saturday"] = "";
-$lang["common_daysmin_sunday"] = "";
-$lang["common_daysmin_monday"] = "";
-$lang["common_daysmin_tueday"] = "";
-$lang["common_daysmin_wednesday"] = "";
-$lang["common_daysmin_thursday"] = "";
-$lang["common_daysmin_friday"] = "";
-$lang["common_daysmin_saturday"] = "";
-$lang["common_months_january"] = "";
-$lang["common_months_february"] = "";
-$lang["common_months_march"] = "";
-$lang["common_months_april"] = "";
-$lang["common_months_may"] = "";
-$lang["common_months_june"] = "";
-$lang["common_months_july"] = "";
-$lang["common_months_august"] = "";
-$lang["common_months_september"] = "";
-$lang["common_months_october"] = "";
-$lang["common_months_november"] = "";
-$lang["common_months_december"] = "";
-$lang["common_monthsshort_january"] = "";
-$lang["common_monthsshort_february"] = "";
-$lang["common_monthsshort_march"] = "";
-$lang["common_monthsshort_april"] = "";
-$lang["common_monthsshort_may"] = "";
-$lang["common_monthsshort_june"] = "";
-$lang["common_monthsshort_july"] = "";
-$lang["common_monthsshort_august"] = "";
-$lang["common_monthsshort_september"] = "";
-$lang["common_monthsshort_october"] = "";
-$lang["common_monthsshort_november"] = "";
-$lang["common_monthsshort_december"] = "";
-$lang["common_today"] = "";
-$lang["common_weekstart"] = "";
diff --git a/application/language/tr/datepicker_lang.php b/application/language/tr/datepicker_lang.php
new file mode 100644
index 000000000..1b4eace1e
--- /dev/null
+++ b/application/language/tr/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "";
+$lang["datepicker_days_monday"] = "";
+$lang["datepicker_days_tueday"] = "";
+$lang["datepicker_days_wednesday"] = "";
+$lang["datepicker_days_thursday"] = "";
+$lang["datepicker_days_friday"] = "";
+$lang["datepicker_days_saturday"] = "";
+$lang["datepicker_daysshort_sunday"] = "";
+$lang["datepicker_daysshort_monday"] = "";
+$lang["datepicker_daysshort_tueday"] = "";
+$lang["datepicker_daysshort_wednesday"] = "";
+$lang["datepicker_daysshort_thursday"] = "";
+$lang["datepicker_daysshort_friday"] = "";
+$lang["datepicker_daysshort_saturday"] = "";
+$lang["datepicker_daysmin_sunday"] = "";
+$lang["datepicker_daysmin_monday"] = "";
+$lang["datepicker_daysmin_tueday"] = "";
+$lang["datepicker_daysmin_wednesday"] = "";
+$lang["datepicker_daysmin_thursday"] = "";
+$lang["datepicker_daysmin_friday"] = "";
+$lang["datepicker_daysmin_saturday"] = "";
+$lang["datepicker_months_january"] = "";
+$lang["datepicker_months_february"] = "";
+$lang["datepicker_months_march"] = "";
+$lang["datepicker_months_april"] = "";
+$lang["datepicker_months_may"] = "";
+$lang["datepicker_months_june"] = "";
+$lang["datepicker_months_july"] = "";
+$lang["datepicker_months_august"] = "";
+$lang["datepicker_months_september"] = "";
+$lang["datepicker_months_october"] = "";
+$lang["datepicker_months_november"] = "";
+$lang["datepicker_months_december"] = "";
+$lang["datepicker_monthsshort_january"] = "";
+$lang["datepicker_monthsshort_february"] = "";
+$lang["datepicker_monthsshort_march"] = "";
+$lang["datepicker_monthsshort_april"] = "";
+$lang["datepicker_monthsshort_may"] = "";
+$lang["datepicker_monthsshort_june"] = "";
+$lang["datepicker_monthsshort_july"] = "";
+$lang["datepicker_monthsshort_august"] = "";
+$lang["datepicker_monthsshort_september"] = "";
+$lang["datepicker_monthsshort_october"] = "";
+$lang["datepicker_monthsshort_november"] = "";
+$lang["datepicker_monthsshort_december"] = "";
+$lang["datepicker_today"] = "";
+$lang["datepicker_weekstart"] = "";
diff --git a/application/language/zh/common_lang.php b/application/language/zh/common_lang.php
index 94c5f3ad7..5dfa70271 100755
--- a/application/language/zh/common_lang.php
+++ b/application/language/zh/common_lang.php
@@ -56,51 +56,7 @@ $lang["common_import_full_path"] = "Full path to excel file required";
 $lang["common_import_select_file"] = "";
 $lang["common_import_change_file"] = "";
 $lang["common_import_remove_file"] = "";
+$lang["common_export_excel"] = "Excel Export";
+$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_no"] = "No";
 $lang["common_required"] = "Required";
-$lang["common_days_sunday"] = "";
-$lang["common_days_monday"] = "";
-$lang["common_days_tueday"] = "";
-$lang["common_days_wednesday"] = "";
-$lang["common_days_thursday"] = "";
-$lang["common_days_friday"] = "";
-$lang["common_days_saturday"] = "";
-$lang["common_daysshort_sunday"] = "";
-$lang["common_daysshort_monday"] = "";
-$lang["common_daysshort_tueday"] = "";
-$lang["common_daysshort_wednesday"] = "";
-$lang["common_daysshort_thursday"] = "";
-$lang["common_daysshort_friday"] = "";
-$lang["common_daysshort_saturday"] = "";
-$lang["common_daysmin_sunday"] = "";
-$lang["common_daysmin_monday"] = "";
-$lang["common_daysmin_tueday"] = "";
-$lang["common_daysmin_wednesday"] = "";
-$lang["common_daysmin_thursday"] = "";
-$lang["common_daysmin_friday"] = "";
-$lang["common_daysmin_saturday"] = "";
-$lang["common_months_january"] = "";
-$lang["common_months_february"] = "";
-$lang["common_months_march"] = "";
-$lang["common_months_april"] = "";
-$lang["common_months_may"] = "";
-$lang["common_months_june"] = "";
-$lang["common_months_july"] = "";
-$lang["common_months_august"] = "";
-$lang["common_months_september"] = "";
-$lang["common_months_october"] = "";
-$lang["common_months_november"] = "";
-$lang["common_months_december"] = "";
-$lang["common_monthsshort_january"] = "";
-$lang["common_monthsshort_february"] = "";
-$lang["common_monthsshort_march"] = "";
-$lang["common_monthsshort_april"] = "";
-$lang["common_monthsshort_may"] = "";
-$lang["common_monthsshort_june"] = "";
-$lang["common_monthsshort_july"] = "";
-$lang["common_monthsshort_august"] = "";
-$lang["common_monthsshort_september"] = "";
-$lang["common_monthsshort_october"] = "";
-$lang["common_monthsshort_november"] = "";
-$lang["common_monthsshort_december"] = "";
-$lang["common_today"] = "";
-$lang["common_weekstart"] = "";
diff --git a/application/language/zh/datepicker_lang.php b/application/language/zh/datepicker_lang.php
new file mode 100644
index 000000000..1b4eace1e
--- /dev/null
+++ b/application/language/zh/datepicker_lang.php
@@ -0,0 +1,49 @@
+<?php 
+
+$lang["datepicker_days_sunday"] = "";
+$lang["datepicker_days_monday"] = "";
+$lang["datepicker_days_tueday"] = "";
+$lang["datepicker_days_wednesday"] = "";
+$lang["datepicker_days_thursday"] = "";
+$lang["datepicker_days_friday"] = "";
+$lang["datepicker_days_saturday"] = "";
+$lang["datepicker_daysshort_sunday"] = "";
+$lang["datepicker_daysshort_monday"] = "";
+$lang["datepicker_daysshort_tueday"] = "";
+$lang["datepicker_daysshort_wednesday"] = "";
+$lang["datepicker_daysshort_thursday"] = "";
+$lang["datepicker_daysshort_friday"] = "";
+$lang["datepicker_daysshort_saturday"] = "";
+$lang["datepicker_daysmin_sunday"] = "";
+$lang["datepicker_daysmin_monday"] = "";
+$lang["datepicker_daysmin_tueday"] = "";
+$lang["datepicker_daysmin_wednesday"] = "";
+$lang["datepicker_daysmin_thursday"] = "";
+$lang["datepicker_daysmin_friday"] = "";
+$lang["datepicker_daysmin_saturday"] = "";
+$lang["datepicker_months_january"] = "";
+$lang["datepicker_months_february"] = "";
+$lang["datepicker_months_march"] = "";
+$lang["datepicker_months_april"] = "";
+$lang["datepicker_months_may"] = "";
+$lang["datepicker_months_june"] = "";
+$lang["datepicker_months_july"] = "";
+$lang["datepicker_months_august"] = "";
+$lang["datepicker_months_september"] = "";
+$lang["datepicker_months_october"] = "";
+$lang["datepicker_months_november"] = "";
+$lang["datepicker_months_december"] = "";
+$lang["datepicker_monthsshort_january"] = "";
+$lang["datepicker_monthsshort_february"] = "";
+$lang["datepicker_monthsshort_march"] = "";
+$lang["datepicker_monthsshort_april"] = "";
+$lang["datepicker_monthsshort_may"] = "";
+$lang["datepicker_monthsshort_june"] = "";
+$lang["datepicker_monthsshort_july"] = "";
+$lang["datepicker_monthsshort_august"] = "";
+$lang["datepicker_monthsshort_september"] = "";
+$lang["datepicker_monthsshort_october"] = "";
+$lang["datepicker_monthsshort_november"] = "";
+$lang["datepicker_monthsshort_december"] = "";
+$lang["datepicker_today"] = "";
+$lang["datepicker_weekstart"] = "";
diff --git a/application/views/partial/datepicker_locale.php b/application/views/partial/datepicker_locale.php
index 92ef132c4..7cfbafa4e 100644
--- a/application/views/partial/datepicker_locale.php
+++ b/application/views/partial/datepicker_locale.php
@@ -1,54 +1,54 @@
 $.fn.datetimepicker.dates['<?php echo $this->config->item("language"); ?>'] = {
-    days: ["<?php echo $this->lang->line("common_days_sunday"); ?>",
-        "<?php echo $this->lang->line("common_days_monday"); ?>",
-        "<?php echo $this->lang->line("common_days_tueday"); ?>",
-        "<?php echo $this->lang->line("common_days_wednesday"); ?>",
-        "<?php echo $this->lang->line("common_days_thursday"); ?>",
-        "<?php echo $this->lang->line("common_days_friday"); ?>",
-        "<?php echo $this->lang->line("common_days_saturday"); ?>",
-        "<?php echo $this->lang->line("common_days_sunday"); ?>"],
-        daysShort: ["<?php echo $this->lang->line("common_daysshort_sunday"); ?>",
-        "<?php echo $this->lang->line("common_daysshort_monday"); ?>",
-        "<?php echo $this->lang->line("common_daysshort_tueday"); ?>",
-        "<?php echo $this->lang->line("common_daysshort_wednesday"); ?>",
-        "<?php echo $this->lang->line("common_daysshort_thursday"); ?>",
-        "<?php echo $this->lang->line("common_daysshort_friday"); ?>",
-        "<?php echo $this->lang->line("common_daysshort_saturday"); ?>",
-        "<?php echo $this->lang->line("common_daysshort_sunday"); ?>"],
-        daysMin: ["<?php echo $this->lang->line("common_daysmin_sunday"); ?>",
-        "<?php echo $this->lang->line("common_daysmin_monday"); ?>",
-        "<?php echo $this->lang->line("common_daysmin_tueday"); ?>",
-        "<?php echo $this->lang->line("common_daysmin_wednesday"); ?>",
-        "<?php echo $this->lang->line("common_daysmin_thursday"); ?>",
-        "<?php echo $this->lang->line("common_daysmin_friday"); ?>",
-        "<?php echo $this->lang->line("common_daysmin_saturday"); ?>",
-        "<?php echo $this->lang->line("common_daysmin_sunday"); ?>"],
-        months: ["<?php echo $this->lang->line("common_months_january"); ?>",
-        "<?php echo $this->lang->line("common_months_february"); ?>",
-        "<?php echo $this->lang->line("common_months_march"); ?>",
-        "<?php echo $this->lang->line("common_months_april"); ?>",
-        "<?php echo $this->lang->line("common_months_may"); ?>",
-        "<?php echo $this->lang->line("common_months_june"); ?>",
-        "<?php echo $this->lang->line("common_months_july"); ?>",
-        "<?php echo $this->lang->line("common_months_august"); ?>",
-        "<?php echo $this->lang->line("common_months_september"); ?>",
-        "<?php echo $this->lang->line("common_months_october"); ?>",
-        "<?php echo $this->lang->line("common_months_november"); ?>",
-        "<?php echo $this->lang->line("common_months_december"); ?>"],
-        monthsShort: ["<?php echo $this->lang->line("common_monthsshort_january"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_february"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_march"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_april"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_may"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_june"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_july"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_august"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_september"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_october"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_november"); ?>",
-        "<?php echo $this->lang->line("common_monthsshort_december"); ?>"
+    days: ["<?php echo $this->lang->line("datepicker_days_sunday"); ?>",
+        "<?php echo $this->lang->line("datepicker_days_monday"); ?>",
+        "<?php echo $this->lang->line("datepicker_days_tueday"); ?>",
+        "<?php echo $this->lang->line("datepicker_days_wednesday"); ?>",
+        "<?php echo $this->lang->line("datepicker_days_thursday"); ?>",
+        "<?php echo $this->lang->line("datepicker_days_friday"); ?>",
+        "<?php echo $this->lang->line("datepicker_days_saturday"); ?>",
+        "<?php echo $this->lang->line("datepicker_days_sunday"); ?>"],
+        daysShort: ["<?php echo $this->lang->line("datepicker_daysshort_sunday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysshort_monday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysshort_tueday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysshort_wednesday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysshort_thursday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysshort_friday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysshort_saturday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysshort_sunday"); ?>"],
+        daysMin: ["<?php echo $this->lang->line("datepicker_daysmin_sunday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysmin_monday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysmin_tueday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysmin_wednesday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysmin_thursday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysmin_friday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysmin_saturday"); ?>",
+        "<?php echo $this->lang->line("datepicker_daysmin_sunday"); ?>"],
+        months: ["<?php echo $this->lang->line("datepicker_months_january"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_february"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_march"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_april"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_may"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_june"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_july"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_august"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_september"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_october"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_november"); ?>",
+        "<?php echo $this->lang->line("datepicker_months_december"); ?>"],
+        monthsShort: ["<?php echo $this->lang->line("datepicker_monthsshort_january"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_february"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_march"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_april"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_may"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_june"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_july"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_august"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_september"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_october"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_november"); ?>",
+        "<?php echo $this->lang->line("datepicker_monthsshort_december"); ?>"
     ],
-    today: "<?php echo $this->lang->line("common_today"); ?>",
+    today: "<?php echo $this->lang->line("datepicker_today"); ?>",
     <?php
         if( strpos($this->config->item('timeformat'), 'a') !== false )
         {
@@ -69,5 +69,5 @@ $.fn.datetimepicker.dates['<?php echo $this->config->item("language"); ?>'] = {
     <?php
         }
     ?>
-    weekStart: <?php echo $this->lang->line("common_weekstart"); ?>
+    weekStart: <?php echo $this->lang->line("datepicker_weekstart"); ?>
 };
\ No newline at end of file
diff --git a/application/views/reports/date_input.php b/application/views/reports/date_input.php
index 040ac87ae..c8c6a2f2d 100644
--- a/application/views/reports/date_input.php
+++ b/application/views/reports/date_input.php
@@ -8,72 +8,72 @@ if(isset($error))
 ?>
 <?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
 
-<div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-1 required')); ?>
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?>
 
-	<div class="col-xs-4">
-		<div class="radio">
-			<label>
-				<input type="radio" name="report_type" id="simple_radio" value='simple' checked='checked'/>
-				<?php echo form_dropdown('report_date_range_simple',$report_date_range_simple, '', 'id="report_date_range_simple" class="form-control"'); ?>
-			</label>
-		</div>
-		<div class="radio">
-			<label>
-				<input type="radio" name="report_type" id="complex_radio" value='complex' />
-				<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?></label>
+		<div class="col-xs-4">
+			<div class="radio">
+				<label>
+					<input type="radio" name="report_type" id="simple_radio" value='simple' checked='checked'/>
+					<?php echo form_dropdown('report_date_range_simple',$report_date_range_simple, '', 'id="report_date_range_simple" class="form-control"'); ?>
+				</label>
+			</div>
+			<div class="radio">
+				<label>
+					<input type="radio" name="report_type" id="complex_radio" value='complex' />
+					<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?></label>
+			</div>
 		</div>
 	</div>
-</div>
-
+	
 <?php
-if($mode == 'sale')
-{
+	if($mode == 'sale')
+	{
 ?>
-<div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-1')); ?>
-	<div id='report_sale_type' class="col-xs-4">
-		<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'),
-		'sales' => $this->lang->line('reports_sales'),
-		'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type" class="form-control"'); ?>
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div id='report_sale_type' class="col-xs-3">
+			<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'),
+			'sales' => $this->lang->line('reports_sales'),
+			'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type" class="form-control"'); ?>
+		</div>
 	</div>
-</div>
 <?php
 }
 elseif($mode == 'receiving')
 {
 ?>
-<div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('reports_receiving_type'), 'reports_receiving_type_label', array('class'=>'required control-label col-xs-2')); ?>
-	<div id='report_receiving_type' class="col-xs-4">
-		<?php echo form_dropdown('receiving_type', array('all' => $this->lang->line('reports_all'),
-			'receiving' => $this->lang->line('reports_receivings'),
-			'returns' => $this->lang->line('reports_returns'),
-			'requisitions' => $this->lang->line('reports_requisitions')), 'all', 'id="input_type" class="form-control"'); ?>
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_receiving_type'), 'reports_receiving_type_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div id='report_receiving_type' class="col-xs-3">
+			<?php echo form_dropdown('receiving_type', array('all' => $this->lang->line('reports_all'),
+				'receiving' => $this->lang->line('reports_receivings'),
+				'returns' => $this->lang->line('reports_returns'),
+				'requisitions' => $this->lang->line('reports_requisitions')), 'all', 'id="input_type" class="form-control"'); ?>
+		</div>
 	</div>
-</div>
 <?php
 }
 if (!empty($stock_locations) && count($stock_locations) > 1)
 {
 ?>
-<div class="form-group form-group-sm">
-	<?php echo form_label($this->lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?>
-	<div id='report_stock_location' class="col-xs-4">
-		<?php echo form_dropdown('stock_location',$stock_locations,'all','id="location_id" class="form-control"'); ?>
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div id='report_stock_location' class="col-xs-3">
+			<?php echo form_dropdown('stock_location',$stock_locations,'all','id="location_id" class="form-control"'); ?>
+		</div>
 	</div>
-</div>
 <?php
 }
 ?>
 
 <?php
-echo form_button(array(
-	'name'=>'generate_report',
-	'id'=>'generate_report',
-	'content'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm')
-);
+	echo form_button(array(
+		'name'=>'generate_report',
+		'id'=>'generate_report',
+		'content'=>$this->lang->line('common_submit'),
+		'class'=>'btn btn-primary btn-sm')
+	);
 ?>
 
 <?php echo form_close(); ?>
@@ -91,8 +91,9 @@ $(document).ready(function()
 		startDate: "<?php echo date($this->config->item('dateformat'), time());?>",
 		endDate: "<?php echo date($this->config->item('dateformat'), time());?>"
 	}).on('apply.daterangepicker', function(ev, picker) {
-		start_date = picker.startDate.format('MM-DD-YYYY');
-		end_date = picker.endDate.format('MM-DD-YYYY');
+		$("#complex_radio").attr("checked", "checked");
+		start_date = picker.startDate.format('YYYY-MM-DD');
+		end_date = picker.endDate.format('YYYY-MM-DD');
 	});
 
 	$("#generate_report").click(function()
@@ -121,12 +122,7 @@ $(document).ready(function()
 		}
 		window.location = location;
 	});
-	
-	$("#start_month, #start_day, #start_year, #end_month, #end_day, #end_year").click(function()
-	{
-		$("#complex_radio").attr('checked', 'checked');
-	});
-	
+
 	$("#report_date_range_simple").click(function()
 	{
 		$("#simple_radio").attr('checked', 'checked');
diff --git a/application/views/reports/date_input_excel_export.php b/application/views/reports/date_input_excel_export.php
index 551bbefca..6558747fc 100644
--- a/application/views/reports/date_input_excel_export.php
+++ b/application/views/reports/date_input_excel_export.php
@@ -6,49 +6,76 @@ if(isset($error))
 	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
-	<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'required')); ?>
-	<div id='report_date_range_simple'>
-		<input type="radio" name="report_type" id="simple_radio" value='simple' checked='checked'/>
-		<?php echo form_dropdown('report_date_range_simple',$report_date_range_simple, '', 'id="report_date_range_simple"'); ?>
+<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?>
+
+		<div class="col-xs-4">
+			<div class="radio">
+				<label>
+					<input type="radio" name="report_type" id="simple_radio" value='simple' checked='checked'/>
+					<?php echo form_dropdown('report_date_range_simple',$report_date_range_simple, '', 'id="report_date_range_simple" class="form-control"'); ?>
+				</label>
+			</div>
+			<div class="radio">
+				<label>
+					<input type="radio" name="report_type" id="complex_radio" value='complex' />
+					<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?></label>
+			</div>
+		</div>
 	</div>
-	
-	<div id='report_date_range_complex'>
-		<input type="radio" name="report_type" id="complex_radio" value='complex' />
-		<?php echo form_dropdown('start_month',$months, $selected_month, 'id="start_month"'); ?>
-		<?php echo form_dropdown('start_day',$days, $selected_day, 'id="start_day"'); ?>
-		<?php echo form_dropdown('start_year',$years, $selected_year, 'id="start_year"'); ?>
-		-
-		<?php echo form_dropdown('end_month',$months, $selected_month, 'id="end_month"'); ?>
-		<?php echo form_dropdown('end_day',$days, $selected_day, 'id="end_day"'); ?>
-		<?php echo form_dropdown('end_year',$years, $selected_year, 'id="end_year"'); ?>
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div id='report_sale_type' class="col-xs-3">
+			<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'),
+				'sales' => $this->lang->line('reports_sales'),
+				'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type" class="form-control"'); ?>
+		</div>
 	</div>
-	
-	<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required')); ?>
-	<div id='report_sale_type'>
-		<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'), 
-		'sales' => $this->lang->line('reports_sales'), 	
-		'returns' => $this->lang->line('reports_returns')), 'all', 'id="sale_type"'); ?>
-	</div>
-	
-	<div>
-		Export to Excel: <input type="radio" name="export_excel" id="export_excel_yes" value='1' /> Yes
-		<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> No
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
+		<div class="col-xs-4">
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
+			</label>
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
+			</label>
+		</div>
 	</div>
 
 <?php
-echo form_button(array(
-	'name'=>'generate_report',
-	'id'=>'generate_report',
-	'content'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm')
-);
+	echo form_button(array(
+		'name'=>'generate_report',
+		'id'=>'generate_report',
+		'content'=>$this->lang->line('common_submit'),
+		'class'=>'btn btn-primary btn-sm')
+	);
 ?>
 
+<?php echo form_close(); ?>
+
 <?php $this->load->view("partial/footer"); ?>
 
 <script type="text/javascript" language="javascript">
 $(document).ready(function()
 {
+	var start_date, end_date;
+	$('#daterangepicker').daterangepicker({
+		locale: {
+			format: '<?php echo dateformat_momentjs($this->config->item("dateformat"))?>'
+		},
+		startDate: "<?php echo date($this->config->item('dateformat'), time());?>",
+		endDate: "<?php echo date($this->config->item('dateformat'), time());?>"
+	}).on('apply.daterangepicker', function(ev, picker) {
+		$("#complex_radio").attr("checked", "checked");
+		start_date = picker.startDate.format('YYYY-MM-DD');
+		end_date = picker.endDate.format('YYYY-MM-DD');
+	});
+
 	$("#generate_report").click(function()
 	{
 		var sale_type = $("#sale_type").val();
@@ -64,18 +91,10 @@ $(document).ready(function()
 		}
 		else
 		{
-			var start_date = $("#start_year").val()+'-'+$("#start_month").val()+'-'+$('#start_day').val();
-			var end_date = $("#end_year").val()+'-'+$("#end_month").val()+'-'+$('#end_day').val();
-	
 			window.location = window.location+'/'+start_date + '/'+ end_date + '/'+sale_type+'/'+ export_excel;
 		}
 	});
 	
-	$("#start_month, #start_day, #start_year, #end_month, #end_day, #end_year").click(function()
-	{
-		$("#complex_radio").attr('checked', 'checked');
-	});
-	
 	$("#report_date_range_simple").click(function()
 	{
 		$("#simple_radio").attr('checked', 'checked');
diff --git a/application/views/reports/excel_export.php b/application/views/reports/excel_export.php
index 75f61df23..e246087fa 100644
--- a/application/views/reports/excel_export.php
+++ b/application/views/reports/excel_export.php
@@ -6,20 +6,32 @@ if(isset($error))
 	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
-	<div>
-		Export to Excel: <input type="radio" name="export_excel" id="export_excel_yes" value='1' /> Yes
-		<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> No
+<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
+		<div class="col-xs-4">
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
+			</label>
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
+			</label>
+		</div>
 	</div>
 
 <?php
-echo form_button(array(
-	'name'=>'generate_report',
-	'id'=>'generate_report',
-	'content'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm')
-);
+
+	echo form_button(array(
+		'name'=>'generate_report',
+		'id'=>'generate_report',
+		'content'=>$this->lang->line('common_submit'),
+		'class'=>'btn btn-primary btn-sm')
+	);
 ?>
 
+<?php echo form_close(); ?>
+
 <?php $this->load->view("partial/footer"); ?>
 
 <script type="text/javascript" language="javascript">
diff --git a/application/views/reports/inventory_summary_input.php b/application/views/reports/inventory_summary_input.php
index 64f7f3e94..a72a96a5f 100644
--- a/application/views/reports/inventory_summary_input.php
+++ b/application/views/reports/inventory_summary_input.php
@@ -6,30 +6,46 @@ if(isset($error))
 	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
-	<div>
-		Export to Excel: <input type="radio" name="export_excel" id="export_excel_yes" value='1' /> Yes
-		<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> No
-	</div>
-	
-	<?php echo form_label($this->lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required')); ?>
-	<div id='report_stock_location'>
-		<?php echo form_dropdown('stock_location',$stock_locations,'all','id="location_id"'); ?>
+
+<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
+		<div class="col-xs-4">
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
+			</label>
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
+			</label>
+		</div>
 	</div>
 
-	<?php echo form_label($this->lang->line('reports_item_count'), 'reports_item_count_label', array('class'=>'required')); ?>
-	<div id='report_item_count'>
-		<?php echo form_dropdown('item_count',$item_count,'all','id="item_count"'); ?>
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_stock_location'), 'reports_stock_location_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div id='report_stock_location' class="col-xs-3">
+			<?php echo form_dropdown('stock_location',$stock_locations,'all','id="location_id" class="form-control"'); ?>
+		</div>
+	</div>
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_item_count'), 'reports_item_count_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div id='report_item_count' class="col-xs-3">
+			<?php echo form_dropdown('item_count',$item_count,'all','id="item_count" class="form-control"'); ?>
+		</div>
 	</div>
 
 <?php
-echo form_button(array(
-	'name'=>'generate_report',
-	'id'=>'generate_report',
-	'content'=>$this->lang->line('common_submit'),
-	'class'=>'btn btn-primary btn-sm')
-);
+	echo form_button(array(
+		'name'=>'generate_report',
+		'id'=>'generate_report',
+		'content'=>$this->lang->line('common_submit'),
+		'class'=>'btn btn-primary btn-sm')
+	);
 ?>
 
+<?php echo form_close(); ?>
+
 <?php $this->load->view("partial/footer"); ?>
 
 <script type="text/javascript" language="javascript">
diff --git a/application/views/reports/specific_input.php b/application/views/reports/specific_input.php
index a526e9418..1640badbb 100644
--- a/application/views/reports/specific_input.php
+++ b/application/views/reports/specific_input.php
@@ -6,55 +6,84 @@ if(isset($error))
 	echo "<div class='alert alert-dismissible alert-danger'>".$error."</div>";
 }
 ?>
-	<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'required')); ?>
-	<div id='report_date_range_simple'>
-		<input type="radio" name="report_type" id="simple_radio" value='simple' checked='checked'/>
-		<?php echo form_dropdown('report_date_range_simple',$report_date_range_simple, '', 'id="report_date_range_simple"'); ?>
+
+<?php echo form_open('#', array('id'=>'item_form', 'enctype'=>'multipart/form-data', 'class' => 'form-horizontal')); ?>
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_date_range'), 'report_date_range_label', array('class'=>'control-label col-xs-2 required')); ?>
+
+		<div class="col-xs-4">
+			<div class="radio">
+				<label>
+					<input type="radio" name="report_type" id="simple_radio" value='simple' checked='checked'/>
+					<?php echo form_dropdown('report_date_range_simple',$report_date_range_simple, '', 'id="report_date_range_simple" class="form-control"'); ?>
+				</label>
+			</div>
+			<div class="radio">
+				<label>
+					<input type="radio" name="report_type" id="complex_radio" value='complex' />
+					<?php echo form_input(array('name'=>'daterangepicker', 'class'=>'form-control input-sm', 'id'=>'daterangepicker')); ?></label>
+			</div>
+		</div>
 	</div>
 	
-	<div id='report_date_range_complex'>
-		<input type="radio" name="report_type" id="complex_radio" value='complex' />
-		<?php echo form_dropdown('start_month',$months, $selected_month, 'id="start_month"'); ?>
-		<?php echo form_dropdown('start_day',$days, $selected_day, 'id="start_day"'); ?>
-		<?php echo form_dropdown('start_year',$years, $selected_year, 'id="start_year"'); ?>
-		-
-		<?php echo form_dropdown('end_month',$months, $selected_month, 'id="end_month"'); ?>
-		<?php echo form_dropdown('end_day',$days, $selected_day, 'id="end_day"'); ?>
-		<?php echo form_dropdown('end_year',$years, $selected_year, 'id="end_year"'); ?>
+	<div class="form-group form-group-sm" id="report_specific_input_data">
+		<?php echo form_label($specific_input_name, 'specific_input_name_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div class="col-xs-3">
+			<?php echo form_dropdown('specific_input_data',$specific_input_data, '', 'id="specific_input_data" class="form-control"'); ?>
+		</div>
 	</div>
-	
-	<?php echo form_label($specific_input_name, 'specific_input_name_label', array('class'=>'required')); ?>
-	
-	<div id='report_specific_input_data'>
-		<?php echo form_dropdown('specific_input_data',$specific_input_data, '', 'id="specific_input_data"'); ?>
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required control-label col-xs-2')); ?>
+		<div id='report_sale_type' class="col-xs-3">
+			<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'),
+				'sales' => $this->lang->line('reports_sales'),
+				'returns' => $this->lang->line('reports_returns')), 'all', 'id="input_type" class="form-control"'); ?>
+		</div>
 	</div>
-	
-	<?php echo form_label($this->lang->line('reports_sale_type'), 'reports_sale_type_label', array('class'=>'required')); ?>
-	<div id='report_sale_type'>
-		<?php echo form_dropdown('sale_type', array('all' => $this->lang->line('reports_all'), 
-		  'sales' => $this->lang->line('reports_sales'), 	  
-		  'returns' => $this->lang->line('reports_returns')) , 'all', 'id="sale_type"'); ?>
-	</div>
-	
-	<div>
-		Export to Excel: <input type="radio" name="export_excel" id="export_excel_yes" value='1' /> Yes
-		<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> No
+
+	<div class="form-group form-group-sm">
+		<?php echo form_label($this->lang->line('common_export_excel'), 'export_excel', !empty($basic_version) ? array('class'=>'control-label required col-xs-3') : array('class'=>'control-label col-xs-2')); ?>
+		<div class="col-xs-4">
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_yes" value='1' /> <?php echo $this->lang->line('common_export_excel_yes'); ?>
+			</label>
+			<label class="radio-inline">
+				<input type="radio" name="export_excel" id="export_excel_no" value='0' checked='checked' /> <?php echo $this->lang->line('common_export_excel_no'); ?>
+			</label>
+		</div>
 	</div>
 
 <?php
-echo form_button(array(
-	'name'=>'generate_report',
-	'id'=>'generate_report',
-	'content'=>$this->lang->line('common_submit'),
-	'class'=>'submit_button')
-);
+	echo form_button(array(
+			'name'=>'generate_report',
+			'id'=>'generate_report',
+			'content'=>$this->lang->line('common_submit'),
+			'class'=>'btn btn-primary btn-sm')
+	);
 ?>
 
+<?php echo form_close(); ?>
+
 <?php $this->load->view("partial/footer"); ?>
 
 <script type="text/javascript" language="javascript">
 $(document).ready(function()
 {
+	var start_date, end_date;
+	$('#daterangepicker').daterangepicker({
+		locale: {
+			format: '<?php echo dateformat_momentjs($this->config->item("dateformat"))?>'
+		},
+		startDate: "<?php echo date($this->config->item('dateformat'), time());?>",
+		endDate: "<?php echo date($this->config->item('dateformat'), time());?>"
+	}).on('apply.daterangepicker', function(ev, picker) {
+		$("#complex_radio").attr("checked", "checked");
+		start_date = picker.startDate.format('YYYY-MM-DD');
+		end_date = picker.endDate.format('YYYY-MM-DD');
+	});
+
 	$("#generate_report").click(function()
 	{
 		var sale_type = $("#sale_type").val();
@@ -71,18 +100,10 @@ $(document).ready(function()
 		}
 		else
 		{
-			var start_date = $("#start_year").val()+'-'+$("#start_month").val()+'-'+$('#start_day').val();
-			var end_date = $("#end_year").val()+'-'+$("#end_month").val()+'-'+$('#end_day').val();
-			
 			window.location = window.location+'/'+start_date + '/'+ end_date + '/' + $('#specific_input_data').val() + '/' + sale_type + '/'+ export_excel;
 		}
 	});
 	
-	$("#start_month, #start_day, #start_year, #end_month, #end_day, #end_year").click(function()
-	{
-		$("#complex_radio").attr('checked', 'checked');
-	});
-	
 	$("#report_date_range_simple").click(function()
 	{
 		$("#simple_radio").attr('checked', 'checked');
diff --git a/translations/common_lang.csv b/translations/common_lang.csv
index f26120a41..b41000260 100644
--- a/translations/common_lang.csv
+++ b/translations/common_lang.csv
@@ -26,7 +26,7 @@ common_last_name_required,Nachname ist erforderlich,De achternaam moet ingevuld
 common_last_page,Letzte,Laatste,�ltima,Last,Last,Last,Last,Last,Last,Last
 common_learn_about_project,für neueste Nachrichten zum Projekt,om de laatste informatie te verkrijgen over het project,para leer la información más reciente acerca del proyecto,to learn the latest information about the project,pour les dernières informations sur le projet,了解系統開展進度,", чтобы узнать самую последнюю информацию о проекте",เพื่อศึกษาข้อมูลล่าสุดของโครงการ, ,Untuk belajar informasi terbaru tentang proyek ini
 common_list_of,Liste von,Lijst van,Lista de,List of,Liste de,列表,Список,รายการ,Liste,Daftar
-common_logout,Logout,Logout,Salir,Logout,Déconnexion,登出,Выход,ออกจากระบบ,Çıkış,Keluar
+common_logout,Logout,Logout,Salir,Logout,Déconnion,登出,Выход,ออกจากระบบ,Çıkış,Keluar
 common_new,Neu,Nieuw,Nuevo,New,New,New,New,New,New,New
 common_no_persons_to_display,Keine Personen zum Anzeigen,Er werden geen personen gevonden,No hay gente que mostrar,There are no people to display,Il n\'y a personne à afficher,沒有使用者資料可以顯示,"Там нет людей, чтобы отобразить",ไม่พบข้อมูลตัวบุคคล,Gösterecek kişi yok,Tidak ada orang untuk ditampilkan
 common_or,Oder,Of,Ó,OR,OU,或,ИЛИ,หรือ,Yada,ATAU
@@ -55,51 +55,7 @@ common_import_full_path,Voller Dateipfad zum Excel File notwendig,Full path to e
 common_import_select_file,,,,Select file,,,,,,
 common_import_change_file,,,,Change,,,,,,
 common_import_remove_file,,,,Remove,,,,,,
-common_required,Erforderlich,Required,Requerido,Required,Required,Required,Required,ต้องกรอก,Required,Required
-common_days_sunday,Sonntag,Zondag,Domingo,Sunday,Dimanche,,,,,
-common_days_monday,Montag,Maandag,Lunes,Monday,Lundi,,,,,
-common_days_tueday,Dienstag,Dinsdag,Martes,Tuesday,Mardi,,,,,
-common_days_wednesday,Mittwoch,Woensdag,Mi�rcoles,Wednesday,Mercredi,,,,,
-common_days_thursday,Donnerstag,Donderdag,Jueves,Thursday,Jeudi,,,,,
-common_days_friday,Freitag,Vrijdag,Viernes,Friday,Vendredi,,,,,
-common_days_saturday,Samstag,Zaterdag,S�bado,Saturday,Samedi,,,,,
-common_daysshort_sunday,Son,Zo,Dom,Sun,Dim,,,,,
-common_daysshort_monday,Mon,Ma,Lun,Mon,Lun,,,,,
-common_daysshort_tueday,Die,Di,Mar,Tue,Mar,,,,,
-common_daysshort_wednesday,Mit,Wo,Mi�,Wed,Mer,,,,,
-common_daysshort_thursday,Don,Do,Jue,Thu,Jeu,,,,,
-common_daysshort_friday,Fre,Vr,Vie,Fri,Ven,,,,,
-common_daysshort_saturday,Sam,Za,S�b,Sat,Sam,,,,,
-common_daysmin_sunday,So,Zo,Do,Su,D,,,,,
-common_daysmin_monday,Mo,Ma,Lu,Mo,L,,,,,
-common_daysmin_tueday,Di,Di,Ma,Tu,Ma,,,,,
-common_daysmin_wednesday,Mi,Wo,Mi,We,Me,,,,,
-common_daysmin_thursday,Do,Do,Ju,Th,J,,,,,
-common_daysmin_friday,Fr,Vr,Vi,Fr,V,,,,,
-common_daysmin_saturday,Sa,Za,Sa,Sa,S,,,,,
-common_months_january,Januar,Januari,Enero,January,Janvier,,,,,
-common_months_february,Februar,Februari,Febrero,February,F�vrier,,,,,
-common_months_march,M�rz,Maart,Marzo,March,Mars,,,,,
-common_months_april,April,April,Abril,April,Avril,,,,,
-common_months_may,Mai,Mei,Mayo,May,Mai,,,,,
-common_months_june,Juni,Juni,Junio,June,Juin,,,,,
-common_months_july,Juli,Juli,Julio,July,Juillet,,,,,
-common_months_august,August,Augustus,Agosto,August,Ao�t,,,,,
-common_months_september,September,September,Septiembre,September,Septembre,,,,,
-common_months_october,Oktober,Oktober,Octubre,October,Octobre,,,,,
-common_months_november,November,November,Noviembre,November,Novembre,,,,,
-common_months_december,Dezember,December,Diciembre,December,D�cembre,,,,,
-common_monthsshort_january,Jan,Jan,Ene,Jan,Jan,,,,,
-common_monthsshort_february,Feb,Feb,Feb,Feb,F�v,,,,,
-common_monthsshort_march,M�r,Mrt,Mar,Mar,Mar,,,,,
-common_monthsshort_april,Apr,Apr,Abr,Apr,Avr,,,,,
-common_monthsshort_may,Mai,Mei,May,May,Mai,,,,,
-common_monthsshort_june,Jun,Jun,Jun,Jun,Jui,,,,,
-common_monthsshort_july,Jul,Jul,Jul,Jul,Jui,,,,,
-common_monthsshort_august,Aug,Aug,Ago,Aug,Ao�,,,,,
-common_monthsshort_september,Sep,Sep,Sep,Sep,Sep,,,,,
-common_monthsshort_october,Okt,Okt,Oct,Oct,Oct,,,,,
-common_monthsshort_november,Nov,Nov,Nov,Nov,Nov,,,,,
-common_monthsshort_december,Dez,Dec,Dic,Dec,Dec,,,,,
-common_today,Heute,Vandaag,Hoy,Today,Aujourd'hui,,,,,
-common_weekstart,1,0,0,0,1,,,,,
+common_export_excel,Excel Export,Excel Export,Excel Export,Excel Export,Excel Export,Excel Export,Excel Export,Excel Export,Excel Export,Excel Export
+common_export_excel_yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes,Yes
+common_export_excel_no,No,No,No,No,No,No,No,No,No,No
+common_required,Erforderlich,Required,Requerido,Required,Required,Required,Required,ต้องกรอก,Required,Required
\ No newline at end of file
diff --git a/translations/datepicker_lang.csv b/translations/datepicker_lang.csv
new file mode 100644
index 000000000..a9c1b823d
--- /dev/null
+++ b/translations/datepicker_lang.csv
@@ -0,0 +1,48 @@
+label,de-CH,nl-BE,es,en,fr,zh,ru,th,tr,id
+datepicker_days_sunday,Sonntag,Zondag,Domingo,Sunday,Dimanche,,,,,
+datepicker_days_monday,Montag,Maandag,Lunes,Monday,Lundi,,,,,
+datepicker_days_tueday,Dienstag,Dinsdag,Martes,Tuesday,Mardi,,,,,
+datepicker_days_wednesday,Mittwoch,Woensdag,Mi�rcoles,Wednesday,Mercredi,,,,,
+datepicker_days_thursday,Donnerstag,Donderdag,Jueves,Thursday,Jeudi,,,,,
+datepicker_days_friday,Freitag,Vrijdag,Viernes,Friday,Vendredi,,,,,
+datepicker_days_saturday,Samstag,Zaterdag,S�bado,Saturday,Samedi,,,,,
+datepicker_daysshort_sunday,Son,Zo,Dom,Sun,Dim,,,,,
+datepicker_daysshort_monday,Mon,Ma,Lun,Mon,Lun,,,,,
+datepicker_daysshort_tueday,Die,Di,Mar,Tue,Mar,,,,,
+datepicker_daysshort_wednesday,Mit,Wo,Mi�,Wed,Mer,,,,,
+datepicker_daysshort_thursday,Don,Do,Jue,Thu,Jeu,,,,,
+datepicker_daysshort_friday,Fre,Vr,Vie,Fri,Ven,,,,,
+datepicker_daysshort_saturday,Sam,Za,S�b,Sat,Sam,,,,,
+datepicker_daysmin_sunday,So,Zo,Do,Su,D,,,,,
+datepicker_daysmin_monday,Mo,Ma,Lu,Mo,L,,,,,
+datepicker_daysmin_tueday,Di,Di,Ma,Tu,Ma,,,,,
+datepicker_daysmin_wednesday,Mi,Wo,Mi,We,Me,,,,,
+datepicker_daysmin_thursday,Do,Do,Ju,Th,J,,,,,
+datepicker_daysmin_friday,Fr,Vr,Vi,Fr,V,,,,,
+datepicker_daysmin_saturday,Sa,Za,Sa,Sa,S,,,,,
+datepicker_months_january,Januar,Januari,Enero,January,Janvier,,,,,
+datepicker_months_february,Februar,Februari,Febrero,February,F�vrier,,,,,
+datepicker_months_march,M�rz,Maart,Marzo,March,Mars,,,,,
+datepicker_months_april,April,April,Abril,April,Avril,,,,,
+datepicker_months_may,Mai,Mei,Mayo,May,Mai,,,,,
+datepicker_months_june,Juni,Juni,Junio,June,Juin,,,,,
+datepicker_months_july,Juli,Juli,Julio,July,Juillet,,,,,
+datepicker_months_august,August,Augustus,Agosto,August,Ao�t,,,,,
+datepicker_months_september,September,September,Septiembre,September,Septembre,,,,,
+datepicker_months_october,Oktober,Oktober,Octubre,October,Octobre,,,,,
+datepicker_months_november,November,November,Noviembre,November,Novembre,,,,,
+datepicker_months_december,Dezember,December,Diciembre,December,D�cembre,,,,,
+datepicker_monthsshort_january,Jan,Jan,Ene,Jan,Jan,,,,,
+datepicker_monthsshort_february,Feb,Feb,Feb,Feb,F�v,,,,,
+datepicker_monthsshort_march,M�r,Mrt,Mar,Mar,Mar,,,,,
+datepicker_monthsshort_april,Apr,Apr,Abr,Apr,Avr,,,,,
+datepicker_monthsshort_may,Mai,Mei,May,May,Mai,,,,,
+datepicker_monthsshort_june,Jun,Jun,Jun,Jun,Jui,,,,,
+datepicker_monthsshort_july,Jul,Jul,Jul,Jul,Jui,,,,,
+datepicker_monthsshort_august,Aug,Aug,Ago,Aug,Ao�,,,,,
+datepicker_monthsshort_september,Sep,Sep,Sep,Sep,Sep,,,,,
+datepicker_monthsshort_october,Okt,Okt,Oct,Oct,Oct,,,,,
+datepicker_monthsshort_november,Nov,Nov,Nov,Nov,Nov,,,,,
+datepicker_monthsshort_december,Dez,Dec,Dic,Dec,Dec,,,,,
+datepicker_today,Heute,Vandaag,Hoy,Today,Aujourd'hui,,,,,
+datepicker_weekstart,1,0,0,0,1,,,,,