diff --git a/app/Locale/deu/LC_MESSAGES/default.mo b/app/Locale/deu/LC_MESSAGES/default.mo
index 07ee464..529bb5e 100755
Binary files a/app/Locale/deu/LC_MESSAGES/default.mo and b/app/Locale/deu/LC_MESSAGES/default.mo differ
diff --git a/app/Locale/deu/LC_MESSAGES/default.po b/app/Locale/deu/LC_MESSAGES/default.po
index 5c19ed0..3d80877 100755
--- a/app/Locale/deu/LC_MESSAGES/default.po
+++ b/app/Locale/deu/LC_MESSAGES/default.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2014-02-23 11:10+0100\n"
-"PO-Revision-Date: 2014-03-30 10:27+0100\n"
+"POT-Creation-Date: 2014-03-30 10:34+0200\n"
+"PO-Revision-Date: 2014-03-30 10:35+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
 "Language: de\n"
@@ -15,44 +15,123 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.4\n"
 
-#: Controller/UserController.php:74;83
+#: Controller/UserController.php:95;104;179;226;298;332;417
 msgid "dreamjob.error.page.notFound"
 msgstr ""
 
-#: View/Elements/job_opening_item.ctp:61 View/Job/opening.ctp:40
+#: Controller/UserController.php:197
+msgid "dreamjob.error.page.order.saved"
+msgstr ""
+
+#: Controller/UserController.php:200
+msgid "dreamjob.error.page.order.error"
+msgstr ""
+
+#: Controller/UserController.php:270
+#, fuzzy
+msgid "dreamjob.error.password.notEqual"
+msgstr "Passwort"
+
+#: Controller/UserController.php:327;389
+#, fuzzy
+msgid "dreamjob.page.save.error"
+msgstr "Passwort"
+
+#: Controller/UserController.php:375
+#, fuzzy
+msgid "dreamjob.page.oneType"
+msgstr "Unternehmen"
+
+#: Controller/UserController.php:395
+#, fuzzy
+msgid "dreamjob.page.save"
+msgstr "AGBs"
+
+#: View/Elements/barleft.ctp:50 View/Job/opening.ctp:20
+msgid "dreamjob.company.to"
+msgstr "zum Unternehmen"
+
+#: View/Elements/job_opening_head_extra.ctp:7
+msgid "dreamjob.opening.titleinfo"
+msgstr "Informationen zur Stellenausschreibung"
+
+#: View/Elements/job_opening_head_extra.ctp:8
+#: View/Elements/job_opening_item.ctp:66
 msgid "dreamjob.graducation.company"
 msgstr "vorausgesetzter Abschluss"
 
-#: View/Elements/job_opening_item.ctp:62 View/Job/opening.ctp:41
-#: View/User/company.ctp:71
+#: View/Elements/job_opening_head_extra.ctp:9
+#: View/Elements/job_opening_item.ctp:67 View/Job/opening_edit.ctp:35
+#: View/User/company.ctp:71 View/User/settings_account.ctp:67
+#: View/User/settings_isearch.ctp:30
 msgid "dreamjob.branch"
 msgstr "Branche"
 
-#: View/Elements/job_opening_item.ctp:63
-msgid "dreamjob.city"
-msgstr "Stadt"
-
-#: View/Elements/job_opening_item.ctp:64 View/Job/opening.ctp:42
+#: View/Elements/job_opening_head_extra.ctp:10
+#: View/Elements/job_opening_item.ctp:69 View/Job/opening_edit.ctp:33
+#: View/User/settings_isearch.ctp:32
 msgid "dreamjob.kindofjob"
 msgstr "Jobart"
 
-#: View/Elements/job_opening_item.ctp:65 View/Job/opening.ctp:43
+#: View/Elements/job_opening_head_extra.ctp:11
+#: View/Elements/job_opening_item.ctp:70 View/Job/opening_edit.ctp:32
 msgid "dreamjob.opening.enddate"
 msgstr "Ausschreibungsende"
 
-#: View/Elements/job_opening_item.ctp:70
+#: View/Elements/job_opening_head_extra.ctp:15
+msgid "dreamjob.company.titleinfo"
+msgstr "Informationen zum Unternehmen"
+
+#: View/Elements/job_opening_head_extra.ctp:16
+#: View/User/settings_account.ctp:62
+msgid "dreamjob.company"
+msgstr "Unternehmen"
+
+#: View/Elements/job_opening_head_extra.ctp:17
+#: View/User/settings_account.ctp:68
+msgid "dreamjob.headcount"
+msgstr "Mitarbeiteranzahl"
+
+#: View/Elements/job_opening_head_extra.ctp:18 View/User/company.ctp:67
+#: View/User/settings_account.ctp:66
+msgid "dreamjob.owner"
+msgstr "Ansprechpartner"
+
+#: View/Elements/job_opening_head_extra.ctp:21 View/Job/opening_edit.ctp:42
+#: View/User/company.ctp:76
+msgid "dreamjob.address"
+msgstr "Adresse"
+
+#: View/Elements/job_opening_item.ctp:68 View/Elements/user_worker_item.ctp:41
+#: View/Job/opening_edit.ctp:45 View/User/settings_account.ctp:76
+msgid "dreamjob.city"
+msgstr "Stadt"
+
+#: View/Elements/job_opening_item.ctp:75
 msgid "dreamjob.opening.detail"
 msgstr "Details"
 
-#: View/Elements/job_opening_item.ctp:73
+#: View/Elements/job_opening_item.ctp:78 View/Elements/user_worker_item.ctp:69
+#: View/Job/application.ctp:12;64
+#, fuzzy
+msgid "dreamjob.application"
+msgstr "Meine Bewerbungen"
+
+#: View/Elements/job_opening_item.ctp:79
 msgid "dreamjob.opening.edit"
 msgstr "bearbeiten"
 
-#: View/Elements/job_opening_item.ctp:74
+#: View/Elements/job_opening_item.ctp:80
 msgid "dreamjob.opening.delete"
 msgstr "löschen"
 
-#: View/Elements/job_opening_item.ctp:95 View/Job/opening.ctp:63
+#: View/Elements/job_opening_item.ctp:90;92
+#: View/Elements/user_worker_item.ctp:66 View/Job/application.ctp:37
+#, fuzzy
+msgid "dreamjob.applicated"
+msgstr "bewerben"
+
+#: View/Elements/job_opening_item.ctp:98 View/Job/opening.ctp:49
 msgid "dreamjob.applicate"
 msgstr "bewerben"
 
@@ -64,44 +143,57 @@ msgstr "Admin-Ansicht"
 msgid "dreamjob.startpage"
 msgstr "Startseite"
 
-#: View/Elements/navbar.ctp:9 View/User/company.ctp:87
+#: View/Elements/navbar.ctp:9 View/Home/home.ctp:9 View/User/company.ctp:87
 msgid "dreamjob.search"
 msgstr "Stellensuche"
 
 #: View/Elements/navbar.ctp:10
-msgid "dreamjob.settings"
-msgstr "Einstellungen"
-
-#: View/Elements/navbar.ctp:11
 msgid "dreamjob.service"
 msgstr ""
 
-#: View/Elements/navbar.ctp:12
+#: View/Elements/navbar.ctp:11
 msgid "dreamjob.logout"
 msgstr "Abmelden"
 
-#: View/Elements/navbar.ctp:25 View/Elements/user_worker_header.ctp:36
-#: View/User/company.ctp:35;58
+#: View/Elements/navbar.ctp:24 View/Elements/user_worker_header.ctp:36
+#: View/User/company.ctp:35;58 View/User/settings_account.ctp:36
 msgid "dreamjob.mail"
 msgstr "E-Mail"
 
-#: View/Elements/navbar.ctp:27
+#: View/Elements/navbar.ctp:26 View/User/settings_account.ctp:38
 msgid "dreamjob.password"
 msgstr "Passwort"
 
-#: View/Elements/navbar.ctp:29
+#: View/Elements/navbar.ctp:28
 msgid "dreamjob.login"
 msgstr "Login"
 
-#: View/Elements/user_worker_header.ctp:32
+#: View/Elements/user_worker_cv.ctp:7 View/Elements/user_worker_cv_edit.ctp:9
+#: View/Job/application.ctp:67 View/User/worker.ctp:23;25
+msgid "dreamjob.cv"
+msgstr "Lebenslauf"
+
+#: View/Elements/user_worker_cv_edit.ctp:9
+#, fuzzy
+msgid "dreamjob.edit"
+msgstr "Stadt"
+
+#: View/Elements/user_worker_cv_edit.ctp:9 View/Job/application.ctp:131
+#: View/Job/opening_edit.ctp:49
+#, fuzzy
+msgid "dreamjob.save"
+msgstr "Lebenslauf"
+
+#: View/Elements/user_worker_header.ctp:32 View/User/settings_account.ctp:49
 msgid "dreamjob.iam"
 msgstr "Ich bin"
 
-#: View/Elements/user_worker_header.ctp:43
+#: View/Elements/user_worker_header.ctp:43 View/User/settings_account.ctp:48
 msgid "dreamjob.bday"
 msgstr "Geburtstag"
 
 #: View/Elements/user_worker_header.ctp:52
+#: View/Elements/user_worker_item.ctp:44 View/User/settings_account.ctp:51
 msgid "dreamjob.workexperience"
 msgstr "Berufserfahrung"
 
@@ -113,58 +205,141 @@ msgstr "letzter Abschluss"
 msgid "dreamjob.country.worker"
 msgstr "Staatsangehörigkeit"
 
-#: View/Home/home.ctp:11
+#: View/Elements/user_worker_item.ctp:42 View/Job/opening_edit.ctp:34
+#: View/User/settings_account.ctp:50
+#, fuzzy
+msgid "dreamjob.graducation"
+msgstr "letzter Abschluss"
+
+#: View/Elements/user_worker_item.ctp:44
+#, fuzzy
+msgid "dreamjob.years"
+msgstr "Stellensuche"
+
+#: View/Elements/user_worker_item.ctp:74
+#, fuzzy
+msgid "dreamjob.details"
+msgstr "E-Mail"
+
+#: View/Home/home.ctp:22
+#, fuzzy
+msgid "dreamjob.registration.to"
+msgstr "letzter Abschluss"
+
+#: View/Home/home.ctp:26
+#, fuzzy
+msgid "dreamjob.search.to"
+msgstr "Stellensuche"
+
+#: View/Home/home.ctp:32
+#, fuzzy
+msgid "dreamjob.startpage.openings"
+msgstr "Startseite"
+
+#: View/Home/home.ctp:47
 msgid "forget password"
 msgstr "Passwort vergessen"
 
-#: View/Home/home.ctp:12
+#: View/Home/home.ctp:48
 msgid "register"
 msgstr "registrieren"
 
+#: View/Job/application.ctp:10 View/Job/applicationWorker_list.ctp:7
+#: View/Job/opening.ctp:28
+msgid "dreamjob.my.application"
+msgstr "Meine Bewerbungen"
+
+#: View/Job/application.ctp:16 View/User/company.ctp:97;99;118
+msgid "dreamjob.opening"
+msgstr "Stellenausschreibung"
+
+#: View/Job/application.ctp:39
+#, fuzzy
+msgid "dreamjob.message.send"
+msgstr "Ausschreibungsende"
+
+#: View/Job/application.ctp:128
+#, fuzzy
+msgid "dreamjob.message"
+msgstr "AGBs"
+
+#: View/Job/applicationCompany_list.ctp:13
+#, fuzzy
+msgid "dreamjob.application.archiv.activ"
+msgstr "Meine Bewerbungen"
+
+#: View/Job/applicationCompany_list.ctp:14
+#, fuzzy
+msgid "dreamjob.application.archiv"
+msgstr "Meine Bewerbungen"
+
+#: View/Job/applicationCompany_list.ctp:15
+#, fuzzy
+msgid "dreamjob.application.archiv.all"
+msgstr "Meine Bewerbungen"
+
+#: View/Job/applicationCompany_list.ctp:18
+#, fuzzy
+msgid "dreamjob.applications"
+msgstr "Meine Bewerbungen"
+
+#: View/Job/application_send.ctp:13
+#, fuzzy
+msgid "dreamjob.application.form"
+msgstr "Meine Bewerbungen"
+
+#: View/Job/application_send.ctp:21
+#, fuzzy
+msgid "dreamjob.application.addPages"
+msgstr "Meine Bewerbungen"
+
+#: View/Job/application_send.ctp:33
+#, fuzzy
+msgid "dreamjob.agb.accept"
+msgstr "AGBs"
+
+#: View/Job/application_send.ctp:36
+#, fuzzy
+msgid "dreamjob.application.send"
+msgstr "bewerben"
+
 #: View/Job/favorite.ctp:7
 msgid "dreamjob.my.favority"
 msgstr "Meine Favoriten"
 
-#: View/Job/opening.ctp:13
-msgid "dreamjob.company.to"
-msgstr "zum Unternehmen"
+#: View/Job/opening_edit.ctp:27
+#, fuzzy
+msgid "dreamjob.opening.addForm"
+msgstr "Stellenausschreibung erstellen"
 
-#: View/Job/opening.ctp:21
-msgid "dreamjob.my.application"
-msgstr "Meine Bewerbungen"
-
-#: View/Job/opening.ctp:39
-msgid "dreamjob.opening.titleinfo"
-msgstr "Informationen zur Stellenausschreibung"
-
-#: View/Job/opening.ctp:47
-msgid "dreamjob.company.titleinfo"
-msgstr "Informationen zum Unternehmen"
-
-#: View/Job/opening.ctp:48
-msgid "dreamjob.company"
-msgstr "Unternehmen"
-
-#: View/Job/opening.ctp:49
-msgid "dreamjob.headcount"
-msgstr "Mitarbeiteranzahl"
-
-#: View/Job/opening.ctp:50 View/User/company.ctp:67
-msgid "dreamjob.owner"
-msgstr "Ansprechpartner"
-
-#: View/Job/opening.ctp:53 View/User/company.ctp:76
-msgid "dreamjob.address"
-msgstr "Adresse"
-
-#: View/Job/opening_edit.ctp:26
+#: View/Job/opening_edit.ctp:30
 msgid "dreamjob.title"
 msgstr ""
 
-#: View/Job/opening_edit.ctp:35
+#: View/Job/opening_edit.ctp:31
 msgid "dreamjob.opening.startdate"
 msgstr "Ausschreibungsbeginn"
 
+#: View/Job/opening_edit.ctp:37;39
+#, fuzzy
+msgid "dreamjob.opening.active"
+msgstr "Ausschreibungsende"
+
+#: View/Job/opening_edit.ctp:43 View/User/settings_account.ctp:75
+#, fuzzy
+msgid "dreamjob.street"
+msgstr "Startseite"
+
+#: View/Job/opening_edit.ctp:44 View/User/settings_account.ctp:77
+#, fuzzy
+msgid "dreamjob.postcode"
+msgstr "Passwort"
+
+#: View/Job/opening_edit.ctp:46
+#, fuzzy
+msgid "dreamjob.text"
+msgstr "Stadt"
+
 #: View/Job/opening_list.ctp:7
 msgid "dreamjob.my.opening"
 msgstr "Meine Stellenausschreibungen"
@@ -217,17 +392,116 @@ msgstr "Impressum"
 msgid "dreamjob.advbyus"
 msgstr "Werbung auf dreamJOB schalten"
 
-#: View/User/company.ctp:28;51
+#: View/User/company.ctp:28;51 View/User/settings_account.ctp:70
 msgid "dreamjob.website"
 msgstr "Internetseite"
 
-#: View/User/company.ctp:97;99;123
-msgid "dreamjob.opening"
+#: View/User/settings_account.ctp:18;29 View/User/settings_isearch.ctp:17
+#: View/User/settings_pages.ctp:35
+msgid "dreamjob.settings"
+msgstr "Einstellungen"
+
+#: View/User/settings_account.ctp:19 View/User/settings_isearch.ctp:18
+#: View/User/settings_pages.ctp:36;46
+#, fuzzy
+msgid "dreamjob.settings.pages"
+msgstr "Einstellungen"
+
+#: View/User/settings_account.ctp:23 View/User/settings_isearch.ctp:19;22
+#: View/User/settings_pages.ctp:40
+#, fuzzy
+msgid "dreamjob.settings.isearch"
+msgstr "Einstellungen"
+
+#: View/User/settings_account.ctp:34
+#, fuzzy
+msgid "dreamjob.account"
+msgstr "Mitarbeiteranzahl"
+
+#: View/User/settings_account.ctp:39
+#, fuzzy
+msgid "dreamjob.password2"
+msgstr "Passwort"
+
+#: View/User/settings_account.ctp:43
+#, fuzzy
+msgid "dreamjob.worker"
+msgstr "Ansprechpartner"
+
+#: View/User/settings_account.ctp:45
+#, fuzzy
+msgid "dreamjob.mannerofaddress"
+msgstr "Adresse"
+
+#: View/User/settings_account.ctp:46
+#, fuzzy
+msgid "dreamjob.first_name"
+msgstr "Ich bin"
+
+#: View/User/settings_account.ctp:47
+#, fuzzy
+msgid "dreamjob.last_name"
+msgstr "Ich bin"
+
+#: View/User/settings_account.ctp:54;56
+#, fuzzy
+msgid "dreamjob.searchhidden"
+msgstr "Stellensuche"
+
+#: View/User/settings_account.ctp:64
+#, fuzzy
+msgid "dreamjob.company.nickname"
+msgstr "Unternehmen"
+
+#: View/User/settings_account.ctp:65
+#, fuzzy
+msgid "dreamjob.corporateform"
+msgstr "Kooperationspartner"
+
+#: View/User/settings_account.ctp:73
+#, fuzzy
+msgid "dreamjob.addresse"
+msgstr "Adresse"
+
+#: View/User/settings_account.ctp:79
+#, fuzzy
+msgid "dreamjob.country"
+msgstr "Stadt"
+
+#: View/User/settings_account.ctp:82 View/User/settings_pages.ctp:94
+#, fuzzy
+msgid "dreamjob.settings.save"
+msgstr "Einstellungen"
+
+#: View/User/settings_isearch.ctp:31
+#, fuzzy
+msgid "dreamjob.job"
+msgstr "AGBs"
+
+#: View/User/settings_isearch.ctp:33
+#, fuzzy
+msgid "dreamjob.options"
 msgstr "Stellenausschreibung"
 
-#: View/User/worker.ctp:23;25;49
-msgid "dreamjob.cv"
-msgstr "Lebenslauf"
+#: View/User/settings_isearch.ctp:42;43;45;46;53;54;55
+#, fuzzy
+msgid "dreamjob.form.chooseOne"
+msgstr "Meine Stellenausschreibungen"
+
+#: View/User/settings_pages.ctp:57
+#, fuzzy
+msgid "dreamjob.page.new"
+msgstr "AGBs"
+
+#: View/User/settings_pages.ctp:72
+#, fuzzy
+msgid "dreamjob.pages.types"
+msgstr "Adresse"
+
+#: View/User/settings_pages.ctp:91
+#, fuzzy
+msgid "dreamjob.page.del"
+msgstr "AGBs"
 
 #: Model/AppUser.php:validation for field id
 #: Model/DreamjobListBranch.php:validation
@@ -242,21 +516,31 @@ msgid "naturalNumber"
 msgstr ""
 
 #: Model/AppUser.php:validation for field user_id
-#: Model/DreamjobCompany.php:validation djaccount_ptr_id;validation pro_user
-#: Model/DreamjobJobFavority.php:validation worker_id;validation opening_id
-#: Model/DreamjobJobOpening.php:validation id;validation company_id;validation
-#: kindofjob_id Model/DreamjobPageImage.php:validation page_ptr_id
-#: Model/DreamjobPageInh.php:validation position
+#: Model/DreamjobCompany.php:validation djaccount_ptr_id;validation
+#: branch_id;validation pro_user Model/DreamjobCvCategory.php:validation
+#: id;validation worker_id;validation category_id
+#: Model/DreamjobCvEntry.php:validation Model/DreamjobISearch.php:validation
+#: job_id;validation kindofjob_id Model/DreamjobJobApplication.php:validation
+#: stars;validation opening_id Model/DreamjobJobApplicationPage.php:validation
+#: application_id;validation page_id Model/DreamjobJobFavority.php:validation
+#: Model/DreamjobJobMsg.php:validation application_id
+#: Model/DreamjobJobOpening.php:validation company_id;validation
+#: graducation_id;validation Model/DreamjobPageImage.php:validation
+#: page_ptr_id Model/DreamjobPageInh.php:validation position
 #: Model/DreamjobPageText.php:validation Model/DreamjobUser.php:validation
 #: micapplication_ptr_id Model/DreamjobWorker.php:validation djaccount_ptr_id
 msgid "numeric"
 msgstr ""
 
 #: Model/AppUser.php:validation for field take_systemwide
-#: Model/DreamjobJobOpening.php:validation active
-#: Model/DreamjobWorker.php:validation searchhidden;validation
-#: advertising;validation leadership_ability Model/User.php:validation
-#: is_staff;validation is_active;validation is_superuser
+#: Model/DreamjobJobApplication.php:validation closed;validation
+#: offered;validation saw Model/DreamjobJobMsg.php:validation
+#: fromcompany;validation Model/DreamjobJobOpening.php:validation active
+#: Model/DreamjobListCvCategory.php:validation enddate;validation
+#: startdate;validation place Model/DreamjobWorker.php:validation
+#: searchhidden;validation advertising;validation leadership_ability
+#: Model/User.php:validation is_staff;validation is_active;validation
+#: is_superuser
 msgid "boolean"
 msgstr ""
 
@@ -277,35 +561,37 @@ msgid "multiple"
 msgstr ""
 
 #: Model/DreamjobCompany.php:validation for field corporateform;validation
-#: owner;validation branch Model/DreamjobJobOpening.php:validation
-#: street;validation city;validation postcode;validation title;validation
-#: branch;validation text Model/DreamjobListBranch.php:validation name
+#: owner Model/DreamjobCvEntry.php:validation title;validation place
+#: Model/DreamjobJobApplication.php:validation text
+#: Model/DreamjobJobMsg.php:validation Model/DreamjobJobOpening.php:validation
+#: street;validation city;validation postcode;validation
+#: Model/DreamjobListBranch.php:validation name
 #: Model/DreamjobListCity.php:validation
 #: Model/DreamjobListCountry.php:validation
-#: Model/DreamjobListGraducation.php:validation
+#: Model/DreamjobListCvCategory.php:validation name;validation
+#: place_str;validation title_str Model/DreamjobListGraducation.php:validation
 #: Model/DreamjobListJob.php:validation
 #: Model/DreamjobListKindofjob.php:validation
-#: Model/DreamjobPageImage.php:validation image
 #: Model/DreamjobPageInh.php:validation user_id;validation title
-#: Model/DreamjobPageText.php:validation Model/DreamjobUser.php:validation
-#: postcode Model/DreamjobWorker.php:validation djaccount_ptr_id;validation
+#: Model/DreamjobUser.php:validation postcode
+#: Model/DreamjobWorker.php:validation djaccount_ptr_id;validation
 #: country;validation iam Model/Mannerofaddress.php:validation
 #: Model/User.php:validation first_name;validation last_name;validation
 #: password;validation code;validation comment
 msgid "notEmpty"
 msgstr ""
 
-#: Model/DreamjobJobOpening.php:validation for field id
-msgid "userDefined"
-msgstr ""
-
-#: Model/DreamjobJobOpening.php:validation for field startdate;validation
-#: enddate Model/User.php:validation bday
+#: Model/DreamjobCvEntry.php:validation for field startdate;validation enddate
+#: Model/DreamjobJobOpening.php:validation Model/User.php:validation bday
 msgid "date"
 msgstr ""
 
 #: Model/DreamjobPageImage.php:validation for field image
-msgid "alphaNumeric"
+msgid "Something went wrong with the file upload"
+msgstr ""
+
+#: Model/DreamjobPageImage.php:validation for field image
+msgid "Invalid file, only images allowed"
 msgstr ""
 
 #: Model/User.php:validation for field last_login;validation date_joined