From: Roland Häder <roland@mxchange.org>
Date: Sat, 26 Aug 2017 20:42:41 +0000 (+0200)
Subject: Please cherry-pick:
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=bf6fa22874de9cc92562243977b8798017e8bb39;p=addressbook-war.git

Please cherry-pick:
- rewrote message-box tag to have 2 CSS classes, one for the whole (alert) box,
  one for the message itself
- renamed a lot CSS classes/ids to more common naming covention: foo-bar and
  not foo_bar
- renamed i18n string to ADMIN_FEATURE_UNFINISHED_WARNING as this can be generic
- other small CSS rewrites

Signed-off-by: Roland Häder <roland@mxchange.org>
---

diff --git a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java
index 58a2f96f..896b2c4b 100644
--- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBusinessDataWebRequestBean.java
@@ -32,8 +32,7 @@ import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemo
 import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.basicdata.CompanyBasicData;
 import org.mxchange.jcontactsbusiness.employee.Employee;
-import org.mxchange.jcontactsbusiness.events.basicdata.added.BusinessBasicDataAddedEvent;
-import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableBusinessBasicDataAddedEvent;
+import org.mxchange.jcontactsbusiness.events.basicdata.added.AdminAddedBusinessBasicDataEvent;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException;
 import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData;
 import org.mxchange.jcountry.data.Country;
@@ -42,6 +41,7 @@ import org.mxchange.jphone.phonenumbers.fax.FaxNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.landline.LandLineNumber;
 import org.mxchange.jusercore.model.user.User;
+import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
 
 /**
  * An administrative business contact bean (controller)
@@ -67,7 +67,7 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC
 	 */
 	@Inject
 	@Any
-	private Event<ObservableBusinessBasicDataAddedEvent> businessDataAddedEvent;
+	private Event<ObservableAdminAddedBusinessBasicDataEvent> businessDataAddedEvent;
 
 	/**
 	 * Comments for this company
@@ -234,7 +234,7 @@ public class AddressbookAdminBusinessDataWebRequestBean extends BaseAddressbookC
 			BusinessBasicData updatedBasicData = this.adminBusinessDataBean.addCompanyBasicData(basicData);
 
 			// Fire event
-			this.businessDataAddedEvent.fire(new BusinessBasicDataAddedEvent(updatedBasicData));
+			this.businessDataAddedEvent.fire(new AdminAddedBusinessBasicDataEvent(updatedBasicData));
 		} catch (final BusinessDataAlreadyAddedException e) {
 			// Does already exist
 			throw new FacesException(e);
diff --git a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java
index 6a6521c9..71a98bb9 100644
--- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java
+++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBusinessDataWebSessionBean.java
@@ -16,9 +16,11 @@
  */
 package org.mxchange.addressbook.beans.business.basicdata;
 
+import java.text.MessageFormat;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
+import javax.enterprise.event.Observes;
 import javax.faces.view.facelets.FaceletException;
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -30,6 +32,7 @@ import org.mxchange.addressbook.beans.user.login.AddressbookUserLoginWebSessionC
 import org.mxchange.jcontactsbusiness.basicdata.AdminBusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcontactsbusiness.events.basicdata.added.ObservableAdminAddedBusinessBasicDataEvent;
 import org.mxchange.jcountry.data.Country;
 
 /**
@@ -120,6 +123,37 @@ public class AddressbookBusinessDataWebSessionBean extends BaseAddressbookContro
 		super();
 	}
 
+	/**
+	 * Observers events being fired when an administrator has added company
+	 * basic data.
+	 * <p>
+	 * @param event Event being fired
+	 */
+	public void afterAdminAddedBasicCompanyDataEvent (@Observes final ObservableAdminAddedBusinessBasicDataEvent event) {
+		// Is the parameter valid?
+		if (null == event) {
+			// Throw NPE
+			throw new NullPointerException("event is null");
+		} else if (event.getBasicData() == null) {
+			// Throw NPE again
+			throw new NullPointerException("event.basicData is null");
+		} else if (event.getBasicData().getCompanyDataId() == null) {
+			// Throw NPE again
+			throw new NullPointerException("event.basicData.companyDataId is null");
+		} else if (event.getBasicData().getCompanyDataId() < 1) {
+			// Throw IAE
+			throw new IllegalArgumentException(MessageFormat.format("event.basicData.companyDataId={0} is invalid", event.getBasicData().getCompanyDataId()));
+		} else if (event.getBasicData().getCompanyName() == null) {
+			// Throw NPE again
+			throw new NullPointerException("event.basicData.companyName is null");
+		} else if (event.getBasicData().getCompanyName().isEmpty()) {
+			// Throw IAE again
+			throw new IllegalArgumentException("event.basicData.companyName is empty");
+		}
+
+		// Add it to list
+		this.businessContacts.add(event.getBasicData());
+	}
 
 	/**
 	 * Returns a list of all business contacts
diff --git a/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java
index 273b6d87..549cc425 100644
--- a/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/business/basicdata/AddressbookBusinessContactConverter.java
@@ -25,7 +25,6 @@ import javax.faces.convert.FacesConverter;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jcontacts.contact.Contact;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessBasicData;
 import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException;
@@ -36,12 +35,12 @@ import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundE
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "BusinessContactConverter")
-public class AddressbookBusinessContactConverter implements Converter {
+public class AddressbookBusinessContactConverter implements Converter<BusinessBasicData> {
 
 	/**
 	 * Business contact EJB
 	 */
-	private static BusinessDataSessionBeanRemote BUSINESS_CONTACT_BEAN;
+	private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
 
 	/**
 	 * Default constructor
@@ -50,7 +49,7 @@ public class AddressbookBusinessContactConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public BusinessBasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -62,14 +61,14 @@ public class AddressbookBusinessContactConverter implements Converter {
 
 		// Is the bean there?
 		// @TODO Requires this synchronization or is it (sync) confusing the container?
-		if (null == AddressbookBusinessContactConverter.BUSINESS_CONTACT_BEAN) {
+		if (null == AddressbookBusinessContactConverter.BASIC_DATA_BEAN) {
 			// Try to get it
 			try {
 				// Get initial context
 				Context initialContext = new InitialContext();
 
 				// ... and user controller
-				AddressbookBusinessContactConverter.BUSINESS_CONTACT_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/addressbook-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N
+				AddressbookBusinessContactConverter.BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/addressbook-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N
 			} catch (final NamingException ex) {
 				// Continue to throw it
 				throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
@@ -84,7 +83,7 @@ public class AddressbookBusinessContactConverter implements Converter {
 			Long basicDataId = Long.valueOf(submittedValue);
 
 			// Try to get user instance from it
-			businessContact = AddressbookBusinessContactConverter.BUSINESS_CONTACT_BEAN.findBusinessDataById(basicDataId);
+			businessContact = AddressbookBusinessContactConverter.BASIC_DATA_BEAN.findBusinessDataById(basicDataId);
 		} catch (final NumberFormatException ex) {
 			// Throw again
 			throw new ConverterException(ex);
@@ -98,18 +97,15 @@ public class AddressbookBusinessContactConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final BusinessBasicData value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof Contact)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Contact.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((BusinessBasicData) value).getCompanyDataId());
+		return String.valueOf(value.getCompanyDataId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
index 10a93662..abbc4dd1 100644
--- a/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/business/company_employee/AddressbookCompanyEmployeeConverter.java
@@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.exceptions.employee.CompanyEmployeeNotFoun
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "CompanyEmployeeConverter")
-public class AddressbookCompanyEmployeeConverter implements Converter {
+public class AddressbookCompanyEmployeeConverter implements Converter<Employee> {
 
 	/**
 	 * CompanyEmployee EJB
@@ -49,7 +49,7 @@ public class AddressbookCompanyEmployeeConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public Employee getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -68,7 +68,7 @@ public class AddressbookCompanyEmployeeConverter implements Converter {
 				Context initialContext = new InitialContext();
 
 				// ... and user controller
-				AddressbookCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.company_employee.CompanyEmployeeSessionBeanRemote"); //NOI18N
+				AddressbookCompanyEmployeeConverter.COMPANY_EMPLOYEE_BEAN = (CompanyEmployeeSessionBeanRemote) initialContext.lookup("java:global/addressbook-ejb/companyEmployee!org.mxchange.jcontactsbusiness.employee.CompanyEmployeeSessionBeanRemote"); //NOI18N
 			} catch (final NamingException ex) {
 				// Continue to throw it
 				throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
@@ -97,18 +97,15 @@ public class AddressbookCompanyEmployeeConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final Employee value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof Employee)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Employee.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((Employee) value).getEmployeeId());
+		return String.valueOf(value.getEmployeeId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java b/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
index 6f4536f4..84ad9cda 100644
--- a/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/contact/AddressbookContactConverter.java
@@ -35,7 +35,7 @@ import org.mxchange.jcontacts.exceptions.ContactNotFoundException;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "ContactConverter")
-public class AddressbookContactConverter implements Converter {
+public class AddressbookContactConverter implements Converter<Contact> {
 
 	/**
 	 * User EJB
@@ -49,7 +49,7 @@ public class AddressbookContactConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public Contact getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -97,18 +97,15 @@ public class AddressbookContactConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final Contact value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof Contact)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Contact.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((Contact) value).getContactId());
+		return String.valueOf(value.getContactId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java
index 7de49611..000c87b6 100644
--- a/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/country/AddressbookCountryConverter.java
@@ -36,7 +36,7 @@ import org.mxchange.jcountry.data.CountrySingletonBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "CountryConverter")
-public class AddressbookCountryConverter implements Converter {
+public class AddressbookCountryConverter implements Converter<Country> {
 
 	/**
 	 * Country bean
@@ -50,7 +50,7 @@ public class AddressbookCountryConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public Country getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -109,18 +109,15 @@ public class AddressbookCountryConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final Country value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof Country)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement Country.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((Country) value).getCountryId());
+		return String.valueOf(value.getCountryId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java b/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java
index 753bc47d..12999038 100644
--- a/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/fax/AddressbookFaxNumberConverter.java
@@ -26,7 +26,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
-import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber;
 import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
 
@@ -36,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "FaxNumberConverter")
-public class AddressbookFaxNumberConverter implements Converter {
+public class AddressbookFaxNumberConverter implements Converter<DialableFaxNumber> {
 
 	/**
 	 * Phone EJB
@@ -50,7 +49,7 @@ public class AddressbookFaxNumberConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public DialableFaxNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Log message
 		// @TODO Not possible here: this.loggerBeanLocal.logTrace(MessageFormat.format("{0}.getAsObject: context={1},component={2},submittedValue={3} - CALLED!", this.getClass().getSimpleName(), context, component, submittedValue)); //NOI18N
 
@@ -105,18 +104,15 @@ public class AddressbookFaxNumberConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final DialableFaxNumber value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof DialableNumber)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((DialableNumber) value).getPhoneId());
+		return String.valueOf(value.getPhoneId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java b/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
index 91e37aa5..9705c452 100644
--- a/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/landline/AddressbookLandLineNumberConverter.java
@@ -26,7 +26,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
-import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber;
 import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
 
@@ -36,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "LandLineNumberConverter")
-public class AddressbookLandLineNumberConverter implements Converter {
+public class AddressbookLandLineNumberConverter implements Converter<DialableLandLineNumber> {
 
 	/**
 	 * Phone EJB
@@ -50,7 +49,7 @@ public class AddressbookLandLineNumberConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public DialableLandLineNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -98,18 +97,15 @@ public class AddressbookLandLineNumberConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final DialableLandLineNumber value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof DialableNumber)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((DialableNumber) value).getPhoneId());
+		return String.valueOf(value.getPhoneId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java b/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
index 8bb07d26..7561dcdd 100644
--- a/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/mobile/AddressbookMobileNumberConverter.java
@@ -26,7 +26,6 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import org.mxchange.jphone.exceptions.PhoneEntityNotFoundException;
-import org.mxchange.jphone.phonenumbers.DialableNumber;
 import org.mxchange.jphone.phonenumbers.mobile.DialableMobileNumber;
 import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
 
@@ -36,7 +35,7 @@ import org.mxchange.jphone.phonenumbers.phone.PhoneSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "MobileNumbnerConverter")
-public class AddressbookMobileNumberConverter implements Converter {
+public class AddressbookMobileNumberConverter implements Converter<DialableMobileNumber> {
 
 	/**
 	 * Phone EJB
@@ -50,7 +49,7 @@ public class AddressbookMobileNumberConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public DialableMobileNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -98,18 +97,15 @@ public class AddressbookMobileNumberConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final DialableMobileNumber value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof DialableNumber)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement DialableNumber.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((DialableNumber) value).getPhoneId());
+		return String.valueOf(value.getPhoneId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
index c9f3accd..9fa9c814 100644
--- a/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/mobileprovider/AddressbookMobileProviderConverter.java
@@ -36,7 +36,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBe
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "MobileProviderConverter")
-public class AddressbookMobileProviderConverter implements Converter {
+public class AddressbookMobileProviderConverter implements Converter<MobileProvider> {
 
 	/**
 	 * Mobile provider bean
@@ -50,7 +50,7 @@ public class AddressbookMobileProviderConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public MobileProvider getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -109,18 +109,15 @@ public class AddressbookMobileProviderConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final MobileProvider value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof MobileProvider)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement MobileProvider.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((MobileProvider) value).getProviderId());
+		return String.valueOf(value.getProviderId());
 	}
 
 }
diff --git a/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java
index c888a3d8..6864b6c7 100644
--- a/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java
+++ b/src/java/org/mxchange/addressbook/converter/user/AddressbookUserConverter.java
@@ -35,7 +35,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "UserConverter")
-public class AddressbookUserConverter implements Converter {
+public class AddressbookUserConverter implements Converter<User> {
 
 	/**
 	 * User EJB
@@ -49,7 +49,7 @@ public class AddressbookUserConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public User getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -97,17 +97,15 @@ public class AddressbookUserConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final User value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof User)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement User.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((User) value).getUserId());
+		return String.valueOf(value.getUserId());
 	}
+
 }
diff --git a/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java b/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java
index b37dc742..ae26fc00 100644
--- a/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/birthday/AddressbookBirthdayValidator.java
@@ -16,17 +16,11 @@
  */
 package org.mxchange.addressbook.validator.birthday;
 
-import java.text.MessageFormat;
 import java.util.Date;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
-import javax.faces.convert.ConverterException;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
 import org.mxchange.jcoreee.validator.date.BaseDateValidator;
 
 /**
@@ -35,7 +29,7 @@ import org.mxchange.jcoreee.validator.date.BaseDateValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("BirthdayValidator")
-public class AddressbookBirthdayValidator extends BaseDateValidator implements Validator {
+public class AddressbookBirthdayValidator extends BaseDateValidator {
 
 	/**
 	 * Serial number
@@ -44,17 +38,8 @@ public class AddressbookBirthdayValidator extends BaseDateValidator implements V
 
 	/**
 	 * Default constructor
-	 * @TODO Get rid of this
 	 */
 	public AddressbookBirthdayValidator () {
-		// Try to get it
-		try {
-			// Get initial context
-			Context initialContext = new InitialContext();
-		} catch (final NamingException ex) {
-			// Continue to throw it
-			throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
-		}
 	}
 
 	@Override
diff --git a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
index 39a670f0..62ac246b 100644
--- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
@@ -22,7 +22,6 @@ import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -36,7 +35,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("EmailAddressValidator")
-public class AddressbookEmailAddressValidator extends BaseStringValidator implements Validator {
+public class AddressbookEmailAddressValidator extends BaseStringValidator {
 
 	/**
 	 * Contact session-scoped bean
@@ -113,7 +112,7 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator implem
 			String message = MessageFormat.format("Email address {0} does not match regular expression.", emailAddress); //NOI18N
 
 			// Not matching
-			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, message, message));
+			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message));
 		}
 
 		// Is the bean not yet set?
diff --git a/src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java b/src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java
index 3191be14..c15dd547 100644
--- a/src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/names/AddressbookNameValidator.java
@@ -19,7 +19,6 @@ package org.mxchange.addressbook.validator.names;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
@@ -29,7 +28,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("NameValidator")
-public class AddressbookNameValidator extends BaseStringValidator implements Validator {
+public class AddressbookNameValidator extends BaseStringValidator {
 
 	/**
 	 * Serial number
diff --git a/src/java/org/mxchange/addressbook/validator/password/AddressbookUserPasswordValidator.java b/src/java/org/mxchange/addressbook/validator/password/AddressbookUserPasswordValidator.java
index 20ad5b8b..dac8f671 100644
--- a/src/java/org/mxchange/addressbook/validator/password/AddressbookUserPasswordValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/password/AddressbookUserPasswordValidator.java
@@ -19,9 +19,7 @@ package org.mxchange.addressbook.validator.password;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
-import javax.inject.Inject;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
 /**
@@ -30,7 +28,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UserPasswordValidator")
-public class AddressbookUserPasswordValidator extends BaseStringValidator implements Validator {
+public class AddressbookUserPasswordValidator extends BaseStringValidator {
 
 	/**
 	 * Serial number
@@ -53,7 +51,7 @@ public class AddressbookUserPasswordValidator extends BaseStringValidator implem
 		// Test it here
 		if (!UserUtils.ifPasswordMatches(container, this.userLoginController.getLoggedInUser())) {
 			// Password mismatches
-			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
+			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, "Password mismatching.", "The password the user has entered does not match the stored password.")); //NOI18N
 		}
 		 */
 	}
diff --git a/src/java/org/mxchange/addressbook/validator/phone/abroad/AddressbookAbroadDialValidator.java b/src/java/org/mxchange/addressbook/validator/phone/abroad/AddressbookAbroadDialValidator.java
index a5d2b82e..2587b978 100644
--- a/src/java/org/mxchange/addressbook/validator/phone/abroad/AddressbookAbroadDialValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/phone/abroad/AddressbookAbroadDialValidator.java
@@ -21,9 +21,8 @@ import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
-import org.mxchange.jcoreee.validator.BaseObjectValidator;
+import org.mxchange.jcoreee.validator.number.BaseNumberValidator;
 
 /**
  * A validator for phone, fax and mobile numbers
@@ -31,7 +30,7 @@ import org.mxchange.jcoreee.validator.BaseObjectValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("AbroadDialValidator")
-public class AddressbookAbroadDialValidator extends BaseObjectValidator implements Validator {
+public class AddressbookAbroadDialValidator extends BaseNumberValidator {
 
 	/**
 	 * Serial number
@@ -59,11 +58,11 @@ public class AddressbookAbroadDialValidator extends BaseObjectValidator implemen
 				// Not valid range? (1 - 99, very rude)
 				if (number < 1 || number > 99) {
 					// Not allowed
-					throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, MessageFormat.format("Number {0} is not between 1 and 99 inclusive.", number), MessageFormat.format("The entered number {0} is not in the range of 1 and 99 inclusive. This cannot be used as abroad dial prefix. Alternatively enter international '+' sign.", number))); //NOI18N
+					throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, MessageFormat.format("Number {0} is not between 1 and 99 inclusive.", number), MessageFormat.format("The entered number {0} is not in the range of 1 and 99 inclusive. This cannot be used as abroad dial prefix. Alternatively enter international '+' sign.", number))); //NOI18N
 				}
 			} catch (final NumberFormatException ex) {
 				// Didn't work
-				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "No number or + entered", "No number or + sign has been entered."), ex); //NOI18N
+				throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, "No number or + entered", "No number or + sign has been entered."), ex); //NOI18N
 			}
 		}
 	}
diff --git a/src/java/org/mxchange/addressbook/validator/phone/number/AddressbookPhoneNumberValidator.java b/src/java/org/mxchange/addressbook/validator/phone/number/AddressbookPhoneNumberValidator.java
index 1d0ce778..ed84f061 100644
--- a/src/java/org/mxchange/addressbook/validator/phone/number/AddressbookPhoneNumberValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/phone/number/AddressbookPhoneNumberValidator.java
@@ -19,7 +19,6 @@ package org.mxchange.addressbook.validator.phone.number;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.number.BaseNumberValidator;
 
@@ -29,7 +28,7 @@ import org.mxchange.jcoreee.validator.number.BaseNumberValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("PhoneNumberValidator")
-public class AddressbookPhoneNumberValidator extends BaseNumberValidator implements Validator {
+public class AddressbookPhoneNumberValidator extends BaseNumberValidator {
 
 	/**
 	 * Serial number
diff --git a/src/java/org/mxchange/addressbook/validator/privacy_terms/AddressbookPrivacyTermsCheckboxValidator.java b/src/java/org/mxchange/addressbook/validator/privacy_terms/AddressbookPrivacyTermsCheckboxValidator.java
index b4df90c7..0a813b9b 100644
--- a/src/java/org/mxchange/addressbook/validator/privacy_terms/AddressbookPrivacyTermsCheckboxValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/privacy_terms/AddressbookPrivacyTermsCheckboxValidator.java
@@ -19,7 +19,6 @@ package org.mxchange.addressbook.validator.privacy_terms;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.bool.BaseBooleanValidator;
 
@@ -29,7 +28,7 @@ import org.mxchange.jcoreee.validator.bool.BaseBooleanValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("PrivacyTermsCheckboxValidator")
-public class AddressbookPrivacyTermsCheckboxValidator extends BaseBooleanValidator implements Validator {
+public class AddressbookPrivacyTermsCheckboxValidator extends BaseBooleanValidator {
 
 	/**
 	 * Serial number
diff --git a/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java b/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
index 3d7dccaa..61e6ab42 100644
--- a/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/user/AddressbookUserIdValidator.java
@@ -22,7 +22,6 @@ import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.ConverterException;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -36,7 +35,7 @@ import org.mxchange.jusercore.model.user.UserSessionBeanRemote;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UserIdValidator")
-public class AddressbookUserIdValidator extends BaseNumberValidator implements Validator {
+public class AddressbookUserIdValidator extends BaseNumberValidator {
 
 	/**
 	 * Remote bean
diff --git a/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
new file mode 100644
index 00000000..b67bc4d9
--- /dev/null
+++ b/src/java/org/mxchange/jfinancials/validator/business/basicdata/FinancialsCompanyNameValidator.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2017 Roland Häder
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.mxchange.jfinancials.validator.business.basicdata;
+
+import java.text.MessageFormat;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.ConverterException;
+import javax.faces.validator.FacesValidator;
+import javax.faces.validator.ValidatorException;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote;
+import org.mxchange.jcoreee.validator.string.BaseStringValidator;
+
+/**
+ * A validator for company names
+ * <p>
+ * @author Roland Häder<roland@mxchange.org>
+ */
+@FacesValidator ("CompanyNameValidator")
+public class FinancialsCompanyNameValidator extends BaseStringValidator {
+
+	/**
+	 * Business contact EJB
+	 */
+	private static BusinessDataSessionBeanRemote BASIC_DATA_BEAN;
+
+	/**
+	 * Serial number
+	 */
+	private static final long serialVersionUID = 57_283_657_476_561L;
+
+	@Override
+	public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException {
+		// All accepted, required fields
+		String[] requiredFields = {"companyName"}; //NOI18N
+
+		// Pre-validation (example: not null, not a string, empty string ...)
+		super.preValidate(context, component, value, requiredFields, false);
+
+		// Convert name to string (now securely checked in BaseStringValidator)
+		String companyName = (String) value;
+
+		// Default is to check on existing names
+		Boolean checkExisting = Boolean.TRUE;
+
+		// Is attribute "allowEmptyValue" set?
+		if (component.getAttributes().containsKey("checkExisting")) { //NOI18N
+			// Get attribute
+			Object attribute = component.getAttributes().get("checkExisting"); //NOI18N
+
+			// Make sure, it is Boolean as no String is accepted anymore
+			if (!(attribute instanceof String)) {
+				// Not valid attribute, please use "true" or "false" (default)
+				throw new IllegalArgumentException("checkExisting must be of type String. Please use \"true\" or \"false\" for f:attribute value."); //NOI18N
+			}
+
+			// Securely cast it
+			checkExisting = Boolean.parseBoolean((String) attribute);
+		}
+
+		// Is the bean not yet set?
+		// @TODO Requires this synchronization or is it (sync) confusing the container?
+		if (null == FinancialsCompanyNameValidator.BASIC_DATA_BEAN) {
+			// Try to get it
+			try {
+				// Get initial context
+				Context initialContext = new InitialContext();
+
+				// ... and user controller
+				FinancialsCompanyNameValidator.BASIC_DATA_BEAN = (BusinessDataSessionBeanRemote) initialContext.lookup("java:global/jfinancials-ejb/businessData!org.mxchange.jcontactsbusiness.basicdata.BusinessDataSessionBeanRemote"); //NOI18N
+			} catch (final NamingException ex) {
+				// Continue to throw it
+				throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
+			}
+		}
+
+		// Check if name is already used
+		Boolean nameExists = FinancialsCompanyNameValidator.BASIC_DATA_BEAN.isCompanyNameUsed(companyName);
+
+		// Is the user id valid?
+		if ((!nameExists) && (checkExisting)) {
+			// Format message
+			String message = MessageFormat.format("No basic data found with comany name {0}.", companyName);
+
+			// Name does not exist
+			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message)); //NOI18N
+		} else if ((nameExists) && (!checkExisting)) {
+			// Format message
+			String message = MessageFormat.format("Found basic data with comany name {0}.", companyName);
+
+			// Name already exists
+			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message)); //NOI18N
+		}
+	}
+
+}
diff --git a/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java b/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
index 92f2c1e1..bf3d0a52 100644
--- a/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
+++ b/src/java/org/mxchange/jjobs/converter/business/headquarters/JobsCompanyHeadquartersConverter.java
@@ -35,7 +35,7 @@ import org.mxchange.jcontactsbusiness.headquarters.HeadquartersData;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "CompanyHeadquartersConverter")
-public class JobsCompanyHeadquartersConverter implements Converter {
+public class JobsCompanyHeadquartersConverter implements Converter<HeadquartersData> {
 
 	/**
 	 * CompanyEmployee EJB
@@ -49,7 +49,7 @@ public class JobsCompanyHeadquartersConverter implements Converter {
 	}
 
 	@Override
-	public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+	public HeadquartersData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
 		// Is the value null or empty?
 		if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
 			// Warning message
@@ -97,18 +97,15 @@ public class JobsCompanyHeadquartersConverter implements Converter {
 	}
 
 	@Override
-	public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+	public String getAsString (final FacesContext context, final UIComponent component, final HeadquartersData value) {
 		// Is the object null?
 		if ((null == value) || (String.valueOf(value).isEmpty())) {
 			// Is null
 			return ""; //NOI18N
-		} else if (!(value instanceof HeadquartersData)) {
-			// Not same interface
-			throw new IllegalArgumentException(MessageFormat.format("value[]={0} does not implement HeadquartersData.", value.getClass().getSimpleName())); //NOI18N
 		}
 
 		// Return id number
-		return String.valueOf(((HeadquartersData) value).getHeadquartersId());
+		return String.valueOf(value.getHeadquartersId());
 	}
 
 }
diff --git a/src/java/org/mxchange/jjobs/validator/url/JobsUrlValidator.java b/src/java/org/mxchange/jjobs/validator/url/JobsUrlValidator.java
index a9ad396b..e2be8435 100644
--- a/src/java/org/mxchange/jjobs/validator/url/JobsUrlValidator.java
+++ b/src/java/org/mxchange/jjobs/validator/url/JobsUrlValidator.java
@@ -22,7 +22,6 @@ import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.validator.FacesValidator;
-import javax.faces.validator.Validator;
 import javax.faces.validator.ValidatorException;
 import org.mxchange.jcoreee.validator.string.BaseStringValidator;
 
@@ -33,7 +32,7 @@ import org.mxchange.jcoreee.validator.string.BaseStringValidator;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesValidator ("UrlValidator")
-public class JobsUrlValidator extends BaseStringValidator implements Validator {
+public class JobsUrlValidator extends BaseStringValidator {
 
 	/**
 	 * Pattern matcher
@@ -104,7 +103,7 @@ public class JobsUrlValidator extends BaseStringValidator implements Validator {
 			String message = MessageFormat.format("URL {0} does not match regular expression.", url); //NOI18N
 
 			// Not matching
-			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, message, message));
+			throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_WARN, message, message));
 		}
 	}
 
diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 05e81c39..6c5dd4a9 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -844,30 +844,25 @@ GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Bitte wiederholen Sie das eingege
 PAGE_TITLE_ADMIN_AREA=Administration
 #@TODO Please fix German umlauts!
 ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE=Geschaeftliche Kontakte
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=Stammdaten auflisten
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Listet Stammdaten auf
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Stammdaten exportieren
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exportiert Stammdaten
+PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Stammdaten auflisten
 #@TODO Please fix German umlauts!
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=Geschaeftskontakte auflisten
+CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Auflisten von Stammdaten
 #@TODO Please fix German umlauts!
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Listet geschaeftliche Kontakte auf
+ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=Es befinden sich keine Stammdaten in der Datenbank.
 #@TODO Please fix German umlauts!
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Geschaeftliche Kontakte exportieren
-#@TODO Please fix German umlauts!
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exportiert geschaeftliche Kontakte
-#@TODO Please fix German umlauts!
-PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Geschaeftliche Kontakte auflisten
-#@TODO Please fix German umlauts!
-CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Auflisten von geschaeftlichen Kontakt
-#@TODO Please fix German umlauts!
-ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=Es befinden sich keine geschaeftlichen Kontakte in der Datenbank.
-#@TODO Please fix German umlauts!
-TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=Tabelle listet geschaeftliche Kontakte auf.
+TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=Tabelle listet Stammdaten auf.
 ADMIN_BUSINESS_BASIC_DATA_ID=Id-Nummer:
 #@TODO Please fix German umlauts!
-ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Details des geschaeftlichen Kontaktes anzeigen.
+ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Details des Stammdatens anzeigen.
 ADMIN_BUSINESS_BASIC_DATA_OWNER_ID=Zugew. Benutzer:
 ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Benutzerprofil des zugewiesenen Benutzers anzeigen.
 ADMIN_LINK_ASSIGN=Zuweisen
 #@TODO Please fix German umlauts!
-ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Geschaeftlichen Kontakt einen Benutzeraccount zuweisen.
+ADMIN_LINK_ASSIGN_BUSINESS_BASIC_DATA_OWNER_USER_TITLE=Stammdaten einen Benutzeraccount zuweisen.
 ADMIN_BUSINESS_BASIC_DATA_COMPANY_NAME=Firmenname:
 ADMIN_BUSINESS_BASIC_DATA_CONTACT_PERSON=Ansprechpartner:
 ADMIN_LINK_SHOW_BUSINESS_BASIC_DATA_CONTACT_PERSON_TITLE=Zeigt einen Mitarbeiter an, der als Ansprechpartner eingetragen ist.
@@ -901,7 +896,7 @@ BUTTON_CHANGE_LOCALE_TITLE=Aendern Sie hier in der aktuellen Sitzung die angezei
 ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET=Fehler: Parameter "labelMessage" nicht gesetzt.
 #@TODO Please fix German umlauts!
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Firmengruender auswaehlen:
-ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED=Das Hochladen des Firmenlogos ist noch nicht fertig gestellt.
+ADMIN_FEATURE_UNFINISHED_WARNING=Diese Funktion ist noch nicht fertiggestellt.
 ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Steuernummer:
 ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Webseiten-URL:
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Unternehmen einem Benutzer zuweisen:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index fd2862e1..afb9bfb9 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -835,14 +835,14 @@ GUEST_REGISTRATION_PASSWORD_NOT_ENTERED=Please enter a password. This must match
 GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED=Please repeat the entered password. This done to confirm the password.
 PAGE_TITLE_ADMIN_AREA=Administration
 ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE=Business contacts
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=List business contacts
-LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Lists business contacts
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Export business contacts
-LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exports business contacts
-PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=List business contacts
-CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Lists business contacts
-ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=There are currently no business contacts in database.
-TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=This table lists business contacts.
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA=List basic company data
+LINK_ADMIN_LIST_BUSINESS_BASIC_DATA_TITLE=Lists basic company data
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA=Export basic company data
+LINK_ADMIN_EXPORT_BUSINESS_BASIC_DATA_TITLE=Exports basic company data
+PAGE_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=List basic company data
+CONTENT_TITLE_ADMIN_LIST_BUSINESS_BASIC_DATA=Lists basic company data
+ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY=There are currently no basic company data in database.
+TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA=This table lists basic company data.
 ADMIN_BUSINESS_BASIC_DATA_ID=Id Number:
 ADMIN_LINK_SHOW_BUSINESS_CONTACT_DATA_TITLE=Show details of this business contact.
 ADMIN_BUSINESS_BASIC_DATA_OWNER_ID=Assigned user:
@@ -875,7 +875,7 @@ BUTTON_CHANGE_LOCALE=Change
 BUTTON_CHANGE_LOCALE_TITLE=Change here in your current session the used language for text output.
 ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET=Error: Parameter "labelMessage" not set.
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER=Choose company founder:
-ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED=The upload of the company logo is currently unfinished.
+ADMIN_FEATURE_UNFINISHED_WARNING=This feature is not yet finished.
 ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER=Tax number:
 ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL=Website URL:
 ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER=Select user to assign with company:
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
index 1bfcb98a..963e838f 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns.tpl
@@ -7,112 +7,112 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:column>
-		<h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+		<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-		<h:outputText id="contactId" styleClass="table_data_field" value="#{beanHelper.contact.contactId}" />
+		<h:outputText id="contactId" styleClass="table-data-field" value="#{beanHelper.contact.contactId}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactCreated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CREATED}" />
+		<h:outputLabel for="contactCreated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CREATED}" />
 
-		<h:outputText id="contactCreated" styleClass="table_data_field" value="#{beanHelper.contact.contactCreated.time}">
+		<h:outputText id="contactCreated" styleClass="table-data-field" value="#{beanHelper.contact.contactCreated.time}">
 			<f:convertDateTime for="contactCreated" type="both" />
 		</h:outputText>
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactUpdated" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
+		<h:outputLabel for="contactUpdated" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_UPDATED}" />
 
-		<h:outputText id="contactUpdated" styleClass="table_data_field" value="#{beanHelper.contact.contactUpdated.time}">
+		<h:outputText id="contactUpdated" styleClass="table-data-field" value="#{beanHelper.contact.contactUpdated.time}">
 			<f:convertDateTime for="contactUpdated" type="both" />
 		</h:outputText>
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="isOwnContact" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
+		<h:outputLabel for="isOwnContact" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_IS_OWN_CONTACT}" />
 
-		<h:outputText id="isOwnContact" styleClass="table_data_field" value="#{beanHelper.contact.isOwnContact()}" />
+		<h:outputText id="isOwnContact" styleClass="table-data-field" value="#{beanHelper.contact.isOwnContact()}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+		<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-		<h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
+		<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+		<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-		<h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
+		<h:outputText id="contactTitle" styleClass="table-data-field" value="#{beanHelper.contact.contactTitle}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+		<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-		<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
+		<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+		<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-		<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
+		<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactStreet" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_STREET}" />
+		<h:outputLabel for="contactStreet" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_STREET}" />
 
-		<h:outputText id="contactStreet" styleClass="table_data_field" value="#{beanHelper.contact.contactStreet}" />
+		<h:outputText id="contactStreet" styleClass="table-data-field" value="#{beanHelper.contact.contactStreet}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactHouseNumber" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
+		<h:outputLabel for="contactHouseNumber" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER}" />
 
-		<h:outputText id="contactHouseNumber" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumber}" />
+		<h:outputText id="contactHouseNumber" styleClass="table-data-field" value="#{beanHelper.contact.contactHouseNumber}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactHouseNumberExtension" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
+		<h:outputLabel for="contactHouseNumberExtension" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION}" />
 
-		<h:outputText id="contactHouseNumberExtension" styleClass="table_data_field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
+		<h:outputText id="contactHouseNumberExtension" styleClass="table-data-field" value="#{beanHelper.contact.contactHouseNumberExtension}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactCountry" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
+		<h:outputLabel for="contactCountry" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COUNTRY_CODE}" />
 
-		<h:outputText id="contactCountry" styleClass="table_data_field" value="#{beanHelper.contact.contactCountry.countryCode}" />
+		<h:outputText id="contactCountry" styleClass="table-data-field" value="#{beanHelper.contact.contactCountry.countryCode}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactZipCode" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
+		<h:outputLabel for="contactZipCode" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ZIP_CODE}" />
 
-		<h:outputText id="contactZipCode" styleClass="table_data_field" value="#{beanHelper.contact.contactZipCode}" />
+		<h:outputText id="contactZipCode" styleClass="table-data-field" value="#{beanHelper.contact.contactZipCode}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactCity" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_CITY}" />
+		<h:outputLabel for="contactCity" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_CITY}" />
 
-		<h:outputText id="contactCity" styleClass="table_data_field" value="#{beanHelper.contact.contactCity}" />
+		<h:outputText id="contactCity" styleClass="table-data-field" value="#{beanHelper.contact.contactCity}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+		<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-		<h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
 		</h:outputLink>
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactBirthday" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
+		<h:outputLabel for="contactBirthday" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_BIRTHDAY}" />
 
-		<h:outputText id="contactBirthday" styleClass="table_data_field" value="#{beanHelper.contact.contactBirthday.time}">
+		<h:outputText id="contactBirthday" styleClass="table-data-field" value="#{beanHelper.contact.contactBirthday.time}">
 			<f:convertDateTime for="contactBirthday" type="date" />
 		</h:outputText>
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactComment" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_COMMENT}" />
+		<h:outputLabel for="contactComment" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_COMMENT}" />
 
-		<h:outputText id="contactComment" styleClass="table_data_field" value="#{beanHelper.contact.contactComment}" />
+		<h:outputText id="contactComment" styleClass="table-data-field" value="#{beanHelper.contact.contactComment}" />
 	</h:column>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
index f510a317..10ced2d5 100644
--- a/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
+++ b/web/WEB-INF/resources/tags/admin/columns/admin_contact_data_columns_mini.tpl
@@ -7,33 +7,33 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:column>
-		<h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+		<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-		<h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
+		<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+		<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-		<h:outputText id="contactTitle" styleClass="table_data_field" value="#{beanHelper.contact.contactTitle}" />
+		<h:outputText id="contactTitle" styleClass="table-data-field" value="#{beanHelper.contact.contactTitle}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+		<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-		<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
+		<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+		<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-		<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
+		<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
 	</h:column>
 
 	<h:column>
-		<h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+		<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-		<h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
+		<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{beanHelper.contact.contactEmailAddress}">
 			<h:outputText value="#{beanHelper.contact.contactEmailAddress}" />
 		</h:outputLink>
 	</h:column>
diff --git a/web/WEB-INF/resources/tags/messages/message_box.tpl b/web/WEB-INF/resources/tags/messages/message_box.tpl
index 6eb85ec1..95b819ab 100644
--- a/web/WEB-INF/resources/tags/messages/message_box.tpl
+++ b/web/WEB-INF/resources/tags/messages/message_box.tpl
@@ -5,28 +5,28 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:f="http://xmlns.jcp.org/jsf/core">
 
-	<h:panelGroup styleClass="message_box" layout="block" rendered="#{rendered}">
-		<div class="message_header">
+	<h:panelGroup styleClass="message-container #{boxStyleClass}" layout="block" rendered="#{empty rendered or rendered}">
+		<div class="message-header">
 			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
 		</div>
 
 		<ui:fragment rendered="#{not empty message}">
-			<ui:fragment rendered="#{not empty styleClass}">
+			<ui:fragment rendered="#{not empty messageStyleClass}">
 				<div class="para">
-					<h:outputText styleClass="#{styleClass}" value="#{message}" />
+					<h:outputText styleClass="#{messageStyleClass}" value="#{message}" />
 				</div>
 			</ui:fragment>
 
-			<ui:fragment rendered="#{empty styleClass}">
+			<ui:fragment rendered="#{empty messageStyleClass}">
 				<div class="para">
-					<h:outputText styleClass="okay" value="#{message}" />
+					<h:outputText styleClass="alert-info" value="#{message}" />
 				</div>
 			</ui:fragment>
 		</ui:fragment>
 
 		<ui:fragment rendered="#{empty message}">
-			<div class="errors para">
-				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
+			<div class="para">
+				<h:outputText styleClass="alert-danger" value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
 			</div>
 		</ui:fragment>
 	</h:panelGroup>
diff --git a/web/WEB-INF/resources/tags/messages/message_box_mini.tpl b/web/WEB-INF/resources/tags/messages/message_box_mini.tpl
deleted file mode 100644
index 893620e2..00000000
--- a/web/WEB-INF/resources/tags/messages/message_box_mini.tpl
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<ui:composition
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-	xmlns:h="http://xmlns.jcp.org/jsf/html"
-	xmlns:f="http://xmlns.jcp.org/jsf/core">
-
-	<h:panelGroup styleClass="message_box_mini" layout="block" rendered="#{rendered}">
-		<div class="message_header">
-			<h:outputText value="#{msg.MESSAGE_BOX_TITLE}" />
-		</div>
-
-		<ui:fragment rendered="#{not empty message}">
-			<ui:fragment rendered="#{not empty styleClass}">
-				<div class="para">
-					<h:outputText styleClass="#{styleClass}" value="#{message}" />
-				</div>
-			</ui:fragment>
-
-			<ui:fragment rendered="#{empty styleClass}">
-				<div class="para">
-					<h:outputText styleClass="okay" value="#{message}" />
-				</div>
-			</ui:fragment>
-		</ui:fragment>
-
-		<ui:fragment rendered="#{empty message}">
-			<div class="errors para">
-				<h:outputText value="#{msg.MESSAGE_BOX_PARAMETER_MESSAGE_EMPTY}" />
-			</div>
-		</ui:fragment>
-	</h:panelGroup>
-</ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
index 3b0981e0..f4cbe83a 100644
--- a/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/mobile_selection_table_row.tpl
@@ -6,20 +6,20 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
-	<widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" styleClass="errors" rendered="#{empty labelMessage}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
 
 	<ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
-		<h:panelGroup styleClass="table_row" layout="block">
-			<div class="table_left_medium">
+		<h:panelGroup styleClass="table-row" layout="block">
+			<div class="table-left-medium">
 				<h:outputLabel for="mobileNumber" value="#{labelMessage}" />
 			</div>
 
-			<div class="table_right_medium">
+			<div class="table-right-medium">
 				<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{targetController.mobileProvider}">
 					<f:converter converterId="MobileProviderConverter" />
-					<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 					<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
 				</h:selectOneMenu>
 
@@ -30,7 +30,7 @@
 		</h:panelGroup>
 
 		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			<h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 		</h:panelGroup>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
index 3609e807..c28166e7 100644
--- a/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_personal_title_table_row.tpl
@@ -6,24 +6,24 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
 	<ui:fragment rendered="#{not empty targetController and (empty rendered or rendered)}">
-		<h:panelGroup styleClass="table_row" layout="block">
-			<div class="table_left_medium">
+		<h:panelGroup styleClass="table-row" layout="block">
+			<div class="table-left-medium">
 				<h:outputLabel for="userPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
 			</div>
 
-			<div class="table_right_medium">
+			<div class="table-right-medium">
 				<h:selectOneMenu styleClass="select" id="userPersonalTitle" value="#{targetController.personalTitle}" required="#{featureController.isFeatureEnabled(targetController.controllerType.concat('_personal_title'))}" requiredMessage="#{msg.FIELD_PERSONAL_TITLE_REQUIRED}">
-					<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
+					<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" noSelectionOption="true" />
 					<f:selectItems value="#{genderController.selectableGenders}" var="personalTitle" itemValue="#{personalTitle}" itemLabel="#{msg[personalTitle.messageKey]}" />
 				</h:selectOneMenu>
 			</div>
 		</h:panelGroup>
 
 		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="userPersonalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			<h:message for="userPersonalTitle" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 		</h:panelGroup>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
index c94a6087..086ad4fe 100644
--- a/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
+++ b/web/WEB-INF/resources/tags/table_rows/user_profile_mode_table_row.tpl
@@ -6,17 +6,17 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
-	<widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" styleClass="errors" rendered="#{empty labelMessage}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_LABEL_MESSAGE_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty labelMessage}" />
 
 	<ui:fragment rendered="#{not empty targetController and not empty labelMessage and (empty rendered or rendered)}">
-		<h:panelGroup styleClass="table_row" layout="block">
-			<div class="table_left_medium">
+		<h:panelGroup styleClass="table-row" layout="block">
+			<div class="table-left-medium">
 				<h:outputLabel for="profileMode" value="#{labelMessage}" />
 			</div>
 
-			<div class="table_right_medium">
+			<div class="table-right-medium">
 				<h:selectOneMenu styleClass="select" id="profileMode" value="#{targetController.userProfileMode}">
 					<f:selectItems value="#{profileModeController.allProfileModes}" var="mode" itemValue="#{mode}" itemLabel="#{msg[mode.messageKey]}" />
 				</h:selectOneMenu>
@@ -24,7 +24,7 @@
 		</h:panelGroup>
 
 		<h:panelGroup styleClass="error_container" layout="block">
-			<h:message for="personalTitle" errorClass="errors" fatalClass="errors" warnClass="errors" />
+			<h:message for="personalTitle" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 		</h:panelGroup>
 	</ui:fragment>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
index b569c98d..eeeb4add 100644
--- a/web/WEB-INF/templates/admin/admin_footer.tpl
+++ b/web/WEB-INF/templates/admin/admin_footer.tpl
@@ -5,7 +5,7 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<div class="footer">
-		<ul class="footer_nav">
+		<ul class="navbar-horizontal">
 			<li><h:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
 		</ul>
 	</div>
diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 92bf06fb..d4e83b00 100644
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -7,7 +7,7 @@
 
 	<div class="menu_outer">
 		<h:panelGroup styleClass="menu" layout="block">
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.ADMIN_MENU_MAIN_TITLE}" />
 			</div>
 
@@ -15,7 +15,7 @@
 				<li><h:link title="#{msg.LINK_ADMIN_INDEX_TITLE}" outcome="admin_index" value="#{msg.LINK_ADMIN_INDEX}" /></li>
 			</ul>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.ADMIN_MENU_USER_TITLE}" />
 			</div>
 
@@ -24,7 +24,7 @@
 				<li><h:link title="#{msg.LINK_ADMIN_EXPORT_USER_TITLE}" outcome="admin_export_user" value="#{msg.LINK_ADMIN_EXPORT_USER}" /></li>
 			</ul>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.ADMIN_MENU_CONTACT_TITLE}" />
 			</div>
 
@@ -34,7 +34,7 @@
 			</ul>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('business_contacts')}">
-				<div class="menu_header">
+				<div class="menu-header">
 					<h:outputText value="#{msg.ADMIN_MENU_BUSINESS_BASIC_DATA_TITLE}" />
 				</div>
 
@@ -44,7 +44,7 @@
 				</ul>
 			</ui:fragment>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.ADMIN_MENU_PHONE_NUMBERS_TITLE}" />
 			</div>
 
@@ -54,7 +54,7 @@
 				<li><h:link title="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS_TITLE}" outcome="admin_list_fax" value="#{msg.LINK_ADMIN_LIST_FAX_PHONE_NUMBERS}" /></li>
 			</ul>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.ADMIN_MENU_COUNTRY_TITLE}" />
 			</div>
 
@@ -62,7 +62,7 @@
 				<li><h:link title="#{msg.LINK_ADMIN_LIST_COUNTRIES_TITLE}" outcome="admin_list_countries" value="#{msg.LINK_ADMIN_LIST_COUNTRIES}" /></li>
 			</ul>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.ADMIN_MENU_MOBILE_PROVIDER_TITLE}" />
 			</div>
 
@@ -70,7 +70,7 @@
 				<li><h:link title="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER_TITLE}" outcome="admin_list_mobile_provider" value="#{msg.LINK_ADMIN_LIST_MOBILE_PROVIDER}" /></li>
 			</ul>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.ADMIN_MENU_LOGOUT_TITLE}" />
 			</div>
 
diff --git a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
index dbff9007..45e2f553 100644
--- a/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
+++ b/web/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
 	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:widgets="http://mxchange.org/jsf/core/widgets"
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
@@ -11,26 +12,29 @@
 				<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyName" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}" />
+				<div class="table-right-medium">
+					<h:inputText styleClass="input" id="companyName" size="30" maxlength="200" required="true" requiredMessage="#{msg.ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED}" value="#{adminCompanyDataController.companyName}">
+						<f:validator validatorId="CompanyNameValidator" />
+						<f:attribute name="checkExisting" value="false" />
+					</h:inputText>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="companyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyEmailAddress" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="companyEmailAddress" size="20" maxlength="255" value="#{adminCompanyDataController.companyEmailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 						<f:validator validatorId="EmailAddressValidator" />
 						<f:attribute name="allowEmptyValue" value="true" />
@@ -39,43 +43,43 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="companyEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyLogo" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_LOGO}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:outputText styleClass="warnings" value="#{msg.ADMIN_BUSINESS_DATA_UPLOAD_LOGO_UNFINISHED}" />
+				<div class="table-right-medium">
+					<widgets:outputMessageBox message="#{msg.ADMIN_FEATURE_UNFINISHED_WARNING}" boxStyleClass="message-full" messageStyleClass="alert-warning" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyLogo" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="companyLogo" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyTaxNumber" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_TAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="companyTaxNumber" size="30" maxlength="200" value="#{adminCompanyDataController.companyTaxNumber}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyTaxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="companyTaxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyWebsiteUrl" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_WEBSITE_URL}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="companyWebsiteUrl" size="30" maxlength="200" value="#{adminCompanyDataController.companyWebsiteUrl}" validatorMessage="#{msg.URL_NOT_MATCHING_REGULAR_EXPRESSION}">
 						<f:validator validatorId="UrlValidator" />
 						<f:attribute name="allowEmptyValue" value="true" />
@@ -84,94 +88,94 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyWebsiteUrl" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="companyWebsiteUrl" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyUserOwner" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_USER_OWNER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="companyUserOwner" value="#{adminCompanyDataController.companyUserOwner}">
 						<f:converter converterId="UserConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{userController.allUsers()}" var="companyUserOwner" itemValue="#{companyUserOwner}" itemLabel="#{companyUserOwner.userContact.contactFirstName} #{companyUserOwner.userContact.contactFamilyName} (#{companyUserOwner.userName})" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyUserOwner" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="companyUserOwner" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyContactEmployee" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_CONTACT_EMPLOYEE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="companyContactEmployee" value="#{adminCompanyDataController.companyContactEmployee}">
 						<f:converter converterId="CompanyEmployeeConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyContactEmployee" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="companyContactEmployee" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyFounder" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_FOUNDER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="companyFounder" value="#{adminCompanyDataController.companyFounder}">
 						<f:converter converterId="CompanyEmployeeConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{companyEmployeeController.allCompanyEmployees()}" var="companyHeadQuarters" itemValue="#{companyEmployee}" itemLabel="#{companyEmployee.foo}" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyFounder" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="companyFounder" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyHeadQuarters" value="#{msg.ADMIN_SELECT_BUSINESS_DATA_COMPANY_HEADQUARTERS}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="companyHeadQuarters" value="#{adminCompanyDataController.companyHeadQuarters}">
 						<f:converter converterId="CompanyHeadquartersConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{companyHeadquartersController.allCompanyHeadquarters()}" var="companyHeadQuarters" itemValue="#{companyHeadQuarters}" itemLabel="#{companyHeadQuarters.foo}" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="companyHeadQuarters" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="companyHeadQuarters" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_BUSINESS_DATA_PHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="landLineCountryCode" value="#{adminCompanyDataController.landLineCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminCompanyDataController.landLineCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
+					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.landLineAreaCode}">
 						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
@@ -181,19 +185,19 @@
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_BUSINESS_DATA_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{adminCompanyDataController.faxCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminCompanyDataController.faxCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
+					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminCompanyDataController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
@@ -203,12 +207,12 @@
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="companyComments" value="#{msg.ADMIN_BUSINESS_DATA_COMPANY_COMMENTS}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputTextarea styleClass="input" id="companyComments" rows="7" cols="25" value="#{adminCompanyDataController.companyComments}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
index e4d35cb9..f196a195 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl
@@ -5,7 +5,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.contact}">
+	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA_MINI}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.contact}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
 				<f:param value="#{beanHelper.contact.contactId}" />
@@ -13,21 +13,21 @@
 		</f:facet>
 
 		<h:column>
-			<h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+			<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-			<h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
+			<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[beanHelper.contact.contactPersonalTitle.messageKey]}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+			<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-			<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{beanHelper.contact.contactFirstName}" />
+			<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{beanHelper.contact.contactFirstName}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+			<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-			<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{beanHelper.contact.contactFamilyName}" />
+			<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{beanHelper.contact.contactFamilyName}" />
 		</h:column>
 	</h:panelGrid>
 </ui:composition>
diff --git a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
index 639d3d01..907110d7 100644
--- a/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_contact_links.tpl
@@ -6,14 +6,14 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 	<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.contact}">
-		<div class="table_header">
+		<div class="table-header">
 			<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
 		</div>
 
-		<h:panelGroup styleClass="table_row" layout="block">
+		<h:panelGroup styleClass="table-row" layout="block">
 			<ul>
 				<li>
 					<h:link outcome="admin_edit_contact" value="#{msg.ADMIN_LINK_EDIT_CONTACT}" title="#{msg.ADMIN_LINK_EDIT_CONTACT_TITLE}">
@@ -23,7 +23,7 @@
 
 				<li>
 					<h:link outcome="admin_delete_contact" title="#{msg.ADMIN_LINK_DELETE_CONTACT_TITLE}">
-						<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_CONTACT}" />
+						<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_CONTACT}" />
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</h:link>
 				</li>
diff --git a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
index 6b86ed49..59ac6584 100644
--- a/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_form_contact_data.tpl
@@ -17,68 +17,68 @@
 
 			<widgets:outputPersonalTitleTableRow targetController="#{adminContactController}" allowEmptyRequiredData="#{allowEmptyRequiredData}" />
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="firstName" value="#{msg.ADMIN_PERSONAL_DATA_FIRST_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{adminContactController.firstName}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="title" value="#{msg.ADMIN_PERSONAL_DATA_TITLE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="title" size="5" maxlength="255" value="#{adminContactController.academicTitle}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="title" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="title" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="familyName" value="#{msg.ADMIN_PERSONAL_DATA_FAMILY_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{adminContactController.familyName}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="street" value="#{msg.ADMIN_PERSONAL_DATA_STREET}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{adminContactController.street}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="houseNumber" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{adminContactController.houseNumber}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
@@ -86,29 +86,29 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="houseNumberExtension" value="#{msg.ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{adminContactController.houseNumberExtension}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="zipCode" value="#{msg.ADMIN_PERSONAL_DATA_ZIP_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{adminContactController.zipCode}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange for="zipCode" minimum="1" maximum="99999" />
 					</h:inputText>
@@ -116,54 +116,54 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="city" value="#{msg.ADMIN_PERSONAL_DATA_CITY}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{adminContactController.city}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="country" value="#{msg.ADMIN_PERSONAL_DATA_COUNTRY_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="country" value="#{adminContactController.contactCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="landLineCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="landLineCountryCode" value="#{adminContactController.landLineCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
+					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{adminContactController.landLineAreaCode}">
 						<f:validator for="landLineAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
@@ -173,19 +173,19 @@
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxCountryCode" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="faxCountryCode" value="#{adminContactController.faxCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="faxCountryCode" value="#{adminContactController.faxCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
+					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{adminContactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
@@ -197,12 +197,12 @@
 
 			<widgets:outputMobileNumberTableRow targetController="#{adminContactController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="emailAddress" value="#{msg.ADMIN_PERSONAL_DATA_EMAIL_ADDRESS}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="emailAddress" size="10" maxlength="255" value="#{adminContactController.emailAddress}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 						<f:validator validatorId="EmailAddressValidator" />
 						<f:attribute name="allowEmptyValue" value="#{allowEmptyRequiredData}" rendered="#{not empty allowEmptyRequiredData}" />
@@ -211,15 +211,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="emailAddress" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="emailAddress" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="contactBirthday" value="#{msg.ADMIN_PERSONAL_DATA_BIRTHDAY}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="contactBirthday" value="#{adminContactController.birthday}" size="10" converterMessage="#{msg.INVALID_BIRTHDAY}">
 						<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
 					</h:inputText>
@@ -227,15 +227,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="contactBirthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="contactBirthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="contactComment" value="#{msg.ADMIN_PERSONAL_DATA_COMMENT}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputTextarea id="contactComment" styleClass="input" value="#{adminContactController.comment}" rows="7" cols="25" />
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
index 5fb4f0c7..bfe0d957 100644
--- a/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
+++ b/web/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.contact}">
+	<h:panelGrid id="show_contact" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_CONTACT_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.contact}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_CONTACT}">
 				<f:param value="#{beanHelper.contact.contactId}" />
diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
index da440128..d80453c9 100644
--- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
+++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl
@@ -15,12 +15,12 @@
 				<h:outputText value="#{msg.ADMIN_COUNTRY_PHONE_DATA_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="countryAbroadDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_ABROAD_DIAL_PREFIX}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
 						<f:validator validatorId="AbroadDialValidator" />
 					</h:inputText>
@@ -28,15 +28,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="countryCode" value="#{msg.ADMIN_ENTER_COUNTRY_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
 						<f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
 					</h:inputText>
@@ -46,15 +46,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="countryCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="countryI18nKey" value="#{msg.ADMIN_ENTER_COUNTRY_I18N_KEY}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
 						<f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
 					</h:inputText>
@@ -62,15 +62,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryI18nKey" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="countryI18nKey" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="countryIsLocalPrefixRequired" value="#{msg.ADMIN_SELECT_COUNTRY_IS_EXTERNAL_DIAL_PREFIX_REQUIRED}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneListbox styleClass="select" required="true" id="countryIsLocalPrefixRequired" value="#{adminCountryController.countryIsLocalPrefixRequired}" size="1">
 						<f:selectItem itemValue="true" itemLabel="#{msg.CHOICE_YES}" />
 						<f:selectItem itemValue="false" itemLabel="#{msg.CHOICE_NO}" />
@@ -79,15 +79,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryIsLocalPrefixRequired" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="countryIsLocalPrefixRequired" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="countryExternalDialPrefix" value="#{msg.ADMIN_ENTER_COUNTRY_EXTERNAL_DIAL_PREFIX}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
 						<f:validateLongRange for="countryExternalDialPrefix" minimum="0" maximum="99" />
 					</h:inputText>
@@ -95,15 +95,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryAbroadDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="countryAbroadDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="countryPhoneCode" value="#{msg.ADMIN_ENTER_COUNTRY_PHONE_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
 						<f:validateLongRange for="countryPhoneCode" minimum="0" maximum="99" />
 					</h:inputText>
@@ -113,7 +113,7 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="countryPhoneCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="countryPhoneCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
index 80fda5a5..bad5b479 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_add_show.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 	<ui:fragment rendered="#{empty beanHelper.contact.contactFaxNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl" />
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
index 568d8bdf..bba847e1 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_data.tpl
@@ -6,49 +6,49 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
-	<h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
+	<h:panelGrid id="fax_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_FAX_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.faxNumber}">
 		<f:facet name="header">
 			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_DATA}" />
 		</f:facet>
 
 		<h:column>
 			<h:panelGroup>
-				<h:outputLabel for="faxNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+				<h:outputLabel for="faxNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 
-				<h:outputText id="faxNumberId" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneId}" />
+				<h:outputText id="faxNumberId" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneId}" />
 
-				<h:message for="faxNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="faxNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="faxNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
+			<h:outputLabel for="faxNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_FAX_NUMBER_COMPLETE}" />
 
-			<h:outputText id="faxNumber" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.faxNumber.phoneCountry.countryPhoneCode} (#{beanHelper.faxNumber.phoneAreaCode}) #{beanHelper.faxNumber.phoneNumber}" />
+			<h:outputText id="faxNumber" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.faxNumber.phoneCountry.countryPhoneCode} (#{beanHelper.faxNumber.phoneAreaCode}) #{beanHelper.faxNumber.phoneNumber}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="faxCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+			<h:outputLabel for="faxCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-			<h:outputText id="faxCreated" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneEntryCreated.time}">
+			<h:outputText id="faxCreated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryCreated.time}">
 				<f:convertDateTime for="contactCreated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="faxUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+			<h:outputLabel for="faxUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-			<h:outputText id="faxUpdated" styleClass="table_data_field" value="#{beanHelper.faxNumber.phoneEntryUpdated.time}">
+			<h:outputText id="faxUpdated" styleClass="table-data-field" value="#{beanHelper.faxNumber.phoneEntryUpdated.time}">
 				<f:convertDateTime for="contactUpdated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-			<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-			<div class="table_data_field">
+			<div class="table-data-field">
 				<ui:include src="/WEB-INF/templates/admin/fax/admin_fax_links.tpl">
 					<ui:param name="isShowPage" value="#{isShowPage}" />
 				</ui:include>
diff --git a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
index 4c60d5ae..c9bb240e 100644
--- a/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_fax_links.tpl
@@ -6,37 +6,37 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
 	<ui:fragment rendered="#{not empty beanHelper.faxNumber}">
-		<ul class="mini_nav">
+		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="mini_link">
+				<li class="navlink-mini">
 					<h:link outcome="admin_show_fax" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
 						<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 					</h:link>
 				</li>
 			</ui:fragment>
 
-			<li class="mini_link">
+			<li class="navlink-mini">
 				<h:link outcome="admin_edit_fax" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
 					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 				</h:link>
 			</li>
 
 			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="mini_link">
+				<li class="navlink-mini">
 					<h:link outcome="admin_unlink_contact_fax">
-						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
 						<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</h:link>
 				</li>
 			</ui:fragment>
 
-			<li class="mini_link">
+			<li class="navlink-mini">
 				<h:link outcome="admin_delete_fax">
-					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
 					<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 				</h:link>
 			</li>
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
index f7c8841e..6ab382d1 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_add_contact_fax.tpl
@@ -6,11 +6,11 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 	<h:form id="form_add_contact_fax" rendered="#{not empty beanHelper.contact}">
-		<h:panelGroup styleClass="table_medium" layout="block">
-			<div class="table_header">
+		<h:panelGroup styleClass="table table-medium" layout="block">
+			<div class="table-header">
 				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_FAX_NUMBER_FORM_TITLE}" />
 			</div>
 
@@ -18,15 +18,15 @@
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
 			</div>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_SELECT_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id=" " value="#{adminPhoneController.faxNumber}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id=" " value="#{adminPhoneController.faxNumber}">
 						<f:converter converterId="FaxNumberConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{adminPhoneController.allNonLinkedFaxNumbers()}" var="faxNumber" itemValue="#{faxNumber}" itemLabel="#{faxNumber.phoneCountry.countryExternalDialPrefix} (#{faxNumber.phoneAreaCode}) #{faxNumber.phoneNumber}" />
 					</h:selectOneMenu>
 				</div>
@@ -36,12 +36,12 @@
 				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_FAX_DATA}" />
 			</div>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminContactPhoneController}" />
 					</ui:include>
@@ -49,15 +49,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<div class="table_footer">
-				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+			<div class="table-footer">
+				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
 				<h:commandButton styleClass="submit" id="submit_add_link_contact_fax" type="submit" action="#{adminContactPhoneController.doLinkMainFaxNumber()}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_FAX_NUMBER}" />
 			</div>
diff --git a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
index 2355ffaf..35b66744 100644
--- a/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
+++ b/web/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.faxNumber}">
 		<fieldset class="fieldset" id="fax_data">
@@ -14,22 +14,22 @@
 				<h:outputText value="#{msg.ADMIN_FAX_NUMBER_DATA_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:outputText id="faxNumberId" value="#{beanHelper.faxNumber.phoneId}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxNumber" value="#{msg.ADMIN_EDIT_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<ui:include src="/WEB-INF/templates/input_fields/fax_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
@@ -37,11 +37,11 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
index 6b866a07..22d08e9e 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl
@@ -6,11 +6,11 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 	<h:form id="form_add_contact_landline" rendered="#{not empty beanHelper.contact}">
-		<h:panelGroup styleClass="table_medium" layout="block">
-			<div class="table_header">
+		<h:panelGroup styleClass="table table-medium" layout="block">
+			<div class="table-header">
 				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_LAND_LINE_NUMBER_FORM_TITLE}" />
 			</div>
 
@@ -18,15 +18,15 @@
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
 			</div>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="landLineNumber" value="#{msg.ADMIN_SELECT_LAND_LINE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="landLineNumber" value="#{adminPhoneController.landLineNumber}">
 						<f:converter converterId="LandLineNumberConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{adminPhoneController.allNonLinkedLandLineNumbers()}" var="landlineNumber" itemValue="#{landlineNumber}" itemLabel="#{landlineNumber.phoneCountry.countryExternalDialPrefix} (#{landlineNumber.phoneAreaCode}) #{landlineNumber.phoneNumber}" />
 					</h:selectOneMenu>
 				</div>
@@ -36,12 +36,12 @@
 				<h:outputText value="#{msg.ADMIN_OR_ENTER_CONTACT_NEW_LAND_LINE_DATA}" />
 			</div>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="landLineNumber" value="#{msg.ADMIN_PERSONAL_DATA_LAND_LINE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
@@ -49,15 +49,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<div class="table_footer">
-				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+			<div class="table-footer">
+				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
 				<h:commandButton styleClass="submit" id="submit_add_link_contact_landline" type="submit" action="#{adminContactPhoneController.doLinkAddLandLineNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_LAND_LINE_NUMBER}">
 					<f:param name="contactId" value="#{param.contactId}" />
diff --git a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
index cdf89951..bb9afb03 100644
--- a/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.landLineNumber}">
 		<fieldset class="fieldset" id="landline_data">
@@ -14,22 +14,22 @@
 				<h:outputText value="#{msg.ADMIN_LAND_LINE_NUMBER_DATA_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="landLineNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:outputText id="landLineNumberId" value="#{beanHelper.landLineNumber.phoneId}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="landLineNumber" value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<ui:include src="/WEB-INF/templates/input_fields/landline_input_fields.tpl">
 						<ui:param name="targetController" value="#{adminPhoneController}" />
 					</ui:include>
@@ -37,11 +37,11 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
index 58473360..460f4f53 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_add_show.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 	<ui:fragment rendered="#{empty beanHelper.contact.contactLandLineNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/landline/admin_form_add_contact_landline.tpl" />
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
index 4ea3a777..7fe00866 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_data.tpl
@@ -6,49 +6,49 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
-	<h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
+	<h:panelGrid id="landline_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_LAND_LINE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.landLineNumber}">
 		<f:facet name="header">
 			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_DATA}" />
 		</f:facet>
 
 		<h:column>
 			<h:panelGroup>
-				<h:outputLabel for="landLineNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+				<h:outputLabel for="landLineNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 
-				<h:outputText id="landLineNumberId" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneId}" />
+				<h:outputText id="landLineNumberId" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneId}" />
 
-				<h:message for="landLineNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="landLineNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="landLineNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
+			<h:outputLabel for="landLineNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_LAND_LINE_NUMBER_COMPLETE}" />
 
-			<h:outputText id="landLineNumber" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.landLineNumber.phoneCountry.countryPhoneCode} (#{beanHelper.landLineNumber.phoneAreaCode}) #{beanHelper.landLineNumber.phoneNumber}" />
+			<h:outputText id="landLineNumber" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneCountry.countryAbroadDialPrefix}#{beanHelper.landLineNumber.phoneCountry.countryPhoneCode} (#{beanHelper.landLineNumber.phoneAreaCode}) #{beanHelper.landLineNumber.phoneNumber}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="landLineCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+			<h:outputLabel for="landLineCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-			<h:outputText id="landLineCreated" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneEntryCreated.time}">
+			<h:outputText id="landLineCreated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryCreated.time}">
 				<f:convertDateTime for="contactCreated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="landLineUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+			<h:outputLabel for="landLineUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-			<h:outputText id="landLineUpdated" styleClass="table_data_field" value="#{beanHelper.landLineNumber.phoneEntryUpdated.time}">
+			<h:outputText id="landLineUpdated" styleClass="table-data-field" value="#{beanHelper.landLineNumber.phoneEntryUpdated.time}">
 				<f:convertDateTime for="contactUpdated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-			<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-			<div class="table_data_field">
+			<div class="table-data-field">
 				<ui:include src="/WEB-INF/templates/admin/landline/admin_landline_links.tpl">
 					<ui:param name="isShowPage" value="#{isShowPage}" />
 				</ui:include>
diff --git a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
index f20ec2d5..ec0c7db3 100644
--- a/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
+++ b/web/WEB-INF/templates/admin/landline/admin_landline_links.tpl
@@ -6,37 +6,37 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
 	<ui:fragment rendered="#{not empty beanHelper.landLineNumber}">
-		<ul class="mini_nav">
+		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="mini_link">
+				<li class="navlink-mini">
 					<h:link outcome="admin_show_landline" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
 						<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 					</h:link>
 				</li>
 			</ui:fragment>
 
-			<li class="mini_link">
+			<li class="navlink-mini">
 				<h:link outcome="admin_edit_landline" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
 					<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 				</h:link>
 			</li>
 
 			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="mini_link">
+				<li class="navlink-mini">
 					<h:link outcome="admin_unlink_contact_landline">
-						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
 						<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</h:link>
 				</li>
 			</ui:fragment>
 
-			<li class="mini_link">
+			<li class="navlink-mini">
 				<h:link outcome="admin_delete_landline">
-					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
 					<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 				</h:link>
 			</li>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
index 2e62ae93..2f9e444a 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl
@@ -6,11 +6,11 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 	<h:form id="form_add_contact_mobile" rendered="#{not empty beanHelper.contact}">
-		<h:panelGroup styleClass="table_medium" layout="block">
-			<div class="table_header">
+		<h:panelGroup styleClass="table table-medium" layout="block">
+			<div class="table-header">
 				<h:outputText value="#{msg.ADMIN_ADD_CONTACT_MOBILE_NUMBER_FORM_TITLE}" />
 			</div>
 
@@ -18,15 +18,15 @@
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_contact_data_mini.tpl" />
 			</div>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_SELECT_MOBILE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="mobileNumber" value="#{adminPhoneController.mobileNumber}">
 						<f:converter converterId="MobileNumberConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{adminPhoneController.allNonLinkedMobileNumbers()}" var="mobileNumber" itemValue="#{mobileNumber}" itemLabel="#{mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix} (#{mobileNumber.mobileProvider.providerDialPrefix}) #{mobileNumber.phoneNumber}" />
 					</h:selectOneMenu>
 				</div>
@@ -38,8 +38,8 @@
 
 			<widgets:outputMobileNumberTableRow targetController="#{adminPhoneController}" labelMessage="#{msg.ADMIN_PERSONAL_DATA_MOBILE_NUMBER}" />
 
-			<div class="table_footer">
-				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+			<div class="table-footer">
+				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
 				<h:commandButton styleClass="submit" id="submit_add_link_contact_mobile" type="submit" action="#{adminContactPhoneController.doLinkAddMobileNumber(beanHelper.contact)}" value="#{msg.BUTTON_ADMIN_LINK_ADD_CONTACT_MOBILE_NUMBER}">
 					<f:param name="contactId" value="#{param.contactId}" />
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl
new file mode 100644
index 00000000..ef10a651
--- /dev/null
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_contact_mobile.tpl
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ui:composition
+	xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:f="http://xmlns.jcp.org/jsf/core"
+	xmlns:h="http://xmlns.jcp.org/jsf/html"
+	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+	<h:outputText styleClass="alert-danger" value="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" rendered="#{empty beanHelper.contact}" />
+
+	<h:form id="form_add_contact_mobile">
+	</h:form>
+</ui:composition>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
index 0b5f36a2..9eb576d1 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty beanHelper.mobileNumber}">
 		<fieldset class="fieldset" id="mobile_data">
@@ -14,40 +14,40 @@
 				<h:outputText value="#{msg.ADMIN_MOBILE_NUMBER_DATA_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="mobileNumberId" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:outputText id="mobileNumberId" value="#{beanHelper.mobileNumber.phoneId}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="mobileProvider" value="#{msg.ADMIN_EDIT_MOBILE_PROVIDER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="mobileProvider" value="#{adminPhoneController.mobileProvider}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_REQUIRED}">
 						<f:converter converterId="MobileProviderConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{mobileProviderController.allMobileProviders()}" var="mobileProvider" itemValue="#{mobileProvider}" itemLabel="#{mobileProvider.providerCountry.countryExternalDialPrefix}#{mobileProvider.providerDialPrefix} (#{mobileProvider.providerName})" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="mobileProvider" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="mobileProvider" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="mobileNumber" value="#{msg.ADMIN_EDIT_MOBILE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="mobileNumber" size="10" maxlength="20" value="#{adminPhoneController.phoneNumber}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_NUMBER_REQUIRED}">
 						<f:validator for="mobileNumber" validatorId="PhoneNumberValidator" />
 					</h:inputText>
@@ -55,7 +55,7 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="mobileNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="mobileNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
index d847f8bb..8328e23f 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_add_show.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}"
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}"
 
 	<ui:fragment rendered="#{empty beanHelper.contact.contactMobileNumber and not empty beanHelper.contact}">
 		<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_add_contact_mobile.tpl" />
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
index af3b3f22..cee89993 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_data.tpl
@@ -6,58 +6,58 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
-	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table_header_column" styleClass="table_medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
+	<h:panelGrid id="mobile_data" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_MOBILE_NUMBER_DATA}" headerClass="table-header-column" styleClass="table table-medium" columns="2" rendered="#{not empty beanHelper.mobileNumber}">
 		<f:facet name="header">
 			<h:outputText value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_DATA}" />
 		</f:facet>
 
 		<h:column>
 			<h:panelGroup>
-				<h:outputLabel for="mobileNumberId" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
+				<h:outputLabel for="mobileNumberId" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_ID}" />
 
-				<h:outputText id="mobileNumberId" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneId}" />
+				<h:outputText id="mobileNumberId" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneId}" />
 
-				<h:message for="mobileNumberId" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="mobileNumberId" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileProvider" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
+			<h:outputLabel for="mobileProvider" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_PROVIDER_NAME}" />
 
 			<h:link id="mobileProvider" outcome="admin_show_mobile_provider">
-				<h:outputText styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
+				<h:outputText styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerName}" />
 				<f:param name="providerId" value="#{beanHelper.mobileNumber.mobileProvider.providerId}" />
 			</h:link>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileNumber" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
+			<h:outputLabel for="mobileNumber" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_MOBILE_NUMBER_COMPLETE}" />
 
-			<h:outputText id="mobileNumber" styleClass="table_data_field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
+			<h:outputText id="mobileNumber" styleClass="table-data-field" value="#{beanHelper.mobileNumber.mobileProvider.providerCountry.countryExternalDialPrefix}#{beanHelper.mobileNumber.mobileProvider.providerDialPrefix}-#{beanHelper.mobileNumber.phoneNumber}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileCreated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
+			<h:outputLabel for="mobileCreated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_CREATED}" />
 
-			<h:outputText id="mobileCreated" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneEntryCreated.time}">
+			<h:outputText id="mobileCreated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryCreated.time}">
 				<f:convertDateTime for="contactCreated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="mobileUpdated" styleClass="table_data_label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
+			<h:outputLabel for="mobileUpdated" styleClass="table-data-label" value="#{msg.ADMIN_SHOW_PHONE_UPDATED}" />
 
-			<h:outputText id="mobileUpdated" styleClass="table_data_field" value="#{beanHelper.mobileNumber.phoneEntryUpdated.time}">
+			<h:outputText id="mobileUpdated" styleClass="table-data-field" value="#{beanHelper.mobileNumber.phoneEntryUpdated.time}">
 				<f:convertDateTime for="contactUpdated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column rendered="#{empty showAdminLinks or showAdminLinks}">
-			<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
+			<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_SHOW_ADMINISTRATIVE_LINKS}" />
 
-			<div class="table_data_field">
+			<div class="table-data-field">
 				<ui:include src="/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl">
 					<ui:param name="isShowPage" value="#{isShowPage}" />
 				</ui:include>
diff --git a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
index 9f9d2f18..08d3b88d 100644
--- a/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
+++ b/web/WEB-INF/templates/admin/mobile/admin_mobile_links.tpl
@@ -6,37 +6,37 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
 	<ui:fragment rendered="#{not empty beanHelper.mobileNumber}">
-		<ul class="mini_nav">
+		<ul class="navbar-mini">
 			<ui:fragment rendered="#{empty isShowPage or not isShowPage}">
-				<li class="mini_link">
+				<li class="navlink-mini">
 					<h:link outcome="admin_show_mobile" value="#{msg.ADMIN_LINK_SHOW_SHORT}" title="#{msg.ADMIN_LINK_SHOW_SHORT_TITLE}">
 						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 					</h:link>
 				</li>
 			</ui:fragment>
 
-			<li class="mini_link">
+			<li class="navlink-mini">
 				<h:link outcome="admin_edit_mobile" value="#{msg.ADMIN_LINK_EDIT_SHORT}" title="#{msg.ADMIN_LINK_EDIT_SHORT_TITLE}">
 					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 				</h:link>
 			</li>
 
 			<ui:fragment rendered="#{not empty beanHelper.contact}">
-				<li class="mini_link">
+				<li class="navlink-mini">
 					<h:link outcome="admin_unlink_contact_mobile">
-						<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+						<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
 						<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 						<f:param name="contactId" value="#{beanHelper.contact.contactId}" />
 					</h:link>
 				</li>
 			</ui:fragment>
 
-			<li class="mini_link">
+			<li class="navlink-mini">
 				<h:link outcome="admin_delete_mobile">
-					<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
+					<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{msg.ADMIN_LINK_DELETE_SHORT_TITLE}" />
 					<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 				</h:link>
 			</li>
diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
index 00d1cf0e..bb704c3b 100644
--- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
+++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl
@@ -15,12 +15,12 @@
 				<h:outputText value="#{msg.ADMIN_MOBILE_PROVIDER_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="providerDialPrefix" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_DIAL_PREFIX}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
 						<f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
 					</h:inputText>
@@ -28,37 +28,37 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="providerDialPrefix" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="providerDialPrefix" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="providerMailPattern" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="providerMailPattern" size="10" maxlength="30" value="#{adminMobileProviderController.providerMailPattern}" />
 
 					<h:outputText styleClass="small notice" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_PATTERN_EXAMPLE}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="providerName" value="#{msg.ADMIN_ENTER_MOBILE_PROVIDER_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="providerName" size="20" maxlength="100" value="#{adminMobileProviderController.providerName}" required="true" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="providerCountry" value="#{msg.ADMIN_SELECT_MOBILE_PROVIDER_COUNTRY}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="providerCountry" value="#{adminMobileProviderController.providerCountry}">
 						<f:converter converterId="CountryConverter" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
diff --git a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
index a2c3dab3..d81fba61 100644
--- a/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_form_user_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" styleClass="errors" rendered="#{empty mode}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_MODE_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty mode}" />
 
 	<h:panelGroup styleClass="para" layout="block" rendered="#{not empty mode}">
 		<fieldset class="fieldset" id="login_data">
@@ -14,42 +14,42 @@
 				<h:outputText value="#{msg.ADMIN_USER_DATA_EMAIL_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="userName" value="#{msg.ADMIN_PERSONAL_DATA_ENTER_USER_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{adminUserController.userName}" required="true" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="userPassword" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{adminUserController.userPassword}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="userPasswordRepeat" value="#{msg.ADMIN_USER_DATA_ENTER_PASSWORD_REPEAT}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{adminUserController.userPasswordRepeat}" />
 				</div>
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block" rendered="#{featureController.isFeatureEnabled('user_must_change_password')}">
+				<div class="table-left-medium">
 					<h:outputLabel for="userMustChangePassword" value="#{msg.ADMIN_USER_MUST_CHANGE_PASSWORD}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectBooleanCheckbox styleClass="checkbox" id="userMustChangePassword" value="#{adminUserController.userMustChangePassword}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
index 5eda467a..67a5f7c8 100644
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.user}">
+	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.user}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
 				<f:param value="#{beanHelper.user.userName}" />
@@ -15,59 +15,59 @@
 		</f:facet>
 
 		<h:column>
-			<h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
+			<h:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
-			<h:outputText id="userId" styleClass="table_data_field" value="#{beanHelper.user.userId}" />
+			<h:outputText id="userId" styleClass="table-data-field" value="#{beanHelper.user.userId}" />
 		</h:column>
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 			<h:column>
-				<h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
+				<h:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
-				<h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
+				<h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
 			</h:column>
 		</ui:fragment>
 
 		<h:column>
-			<h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
+			<h:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-			<h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
+			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
 				<f:convertDateTime for="userCreated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userUpdated" styleClass="table_data_label" value="#{msg.ADMIN_USER_UPDATED}" />
+			<h:outputLabel for="userUpdated" styleClass="table-data-label" value="#{msg.ADMIN_USER_UPDATED}" />
 
-			<h:outputText id="userUpdated" styleClass="table_data_field" value="#{beanHelper.user.userUpdated.time}">
+			<h:outputText id="userUpdated" styleClass="table-data-field" value="#{beanHelper.user.userUpdated.time}">
 				<f:convertDateTime for="userUpdated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+			<h:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
-			<h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+			<h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userProfileMode" styleClass="table_data_label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
+			<h:outputLabel for="userProfileMode" styleClass="table-data-label" value="#{msg.ADMIN_USER_PROFILE_MODE}" />
 
-			<h:outputText id="userProfileMode" styleClass="table_data_field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
+			<h:outputText id="userProfileMode" styleClass="table-data-field" value="#{msg[beanHelper.user.userProfileMode.messageKey]}" />
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userLastLocked" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
+			<h:outputLabel for="userLastLocked" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 
-			<h:outputText id="userLastLocked" styleClass="table_data_field" value="#{beanHelper.user.userLastLocked.time}">
+			<h:outputText id="userLastLocked" styleClass="table-data-field" value="#{beanHelper.user.userLastLocked.time}">
 				<f:convertDateTime for="userLastLocked" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userLastLockedReason" styleClass="table_data_label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
+			<h:outputLabel for="userLastLockedReason" styleClass="table-data-label" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 
-			<h:outputText id="userLastLockedReason" styleClass="table_data_field" value="#{beanHelper.user.userLastLockedReason}" />
+			<h:outputText id="userLastLockedReason" styleClass="table-data-field" value="#{beanHelper.user.userLastLockedReason}" />
 		</h:column>
 
 		<widgets:outputContactDataGridColumns />
diff --git a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
index 9748ffef..bf1fdef4 100644
--- a/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table_header_column" styleClass="table_full" columns="3" rendered="#{not empty beanHelper.user}">
+	<h:panelGrid id="admin_user_profile" summary="#{msg.ADMIN_TABLE_SUMMARY_SHOW_USER_DATA}" headerClass="table-header-column" styleClass="table-full" columns="3" rendered="#{not empty beanHelper.user}">
 		<f:facet name="header">
 			<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_USER}">
 				<f:param value="#{beanHelper.user.userName}" />
@@ -15,9 +15,9 @@
 		</f:facet>
 
 		<h:column>
-			<h:outputLabel for="userId" styleClass="table_data_label" value="#{msg.ADMIN_USER_ID}" />
+			<h:outputLabel for="userId" styleClass="table-data-label" value="#{msg.ADMIN_USER_ID}" />
 
-			<h:panelGroup styleClass="table_data_field" layout="block">
+			<h:panelGroup styleClass="table-data-field" layout="block">
 				<h:link id="userId" outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
 					<f:param name="userId" value="#{beanHelper.user.userId}" />
 				</h:link>
@@ -26,24 +26,24 @@
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 			<h:column>
-				<h:outputLabel for="userName" styleClass="table_data_label" value="#{msg.ADMIN_USER_NAME}" />
+				<h:outputLabel for="userName" styleClass="table-data-label" value="#{msg.ADMIN_USER_NAME}" />
 
-				<h:outputText id="userName" styleClass="table_data_field" value="#{beanHelper.user.userName}" />
+				<h:outputText id="userName" styleClass="table-data-field" value="#{beanHelper.user.userName}" />
 			</h:column>
 		</ui:fragment>
 
 		<h:column>
-			<h:outputLabel for="userCreated" styleClass="table_data_label" value="#{msg.ADMIN_USER_CREATED}" />
+			<h:outputLabel for="userCreated" styleClass="table-data-label" value="#{msg.ADMIN_USER_CREATED}" />
 
-			<h:outputText id="userCreated" styleClass="table_data_field" value="#{beanHelper.user.userCreated.time}">
+			<h:outputText id="userCreated" styleClass="table-data-field" value="#{beanHelper.user.userCreated.time}">
 				<f:convertDateTime for="userCreated" type="both" />
 			</h:outputText>
 		</h:column>
 
 		<h:column>
-			<h:outputLabel for="userAccountStatus" styleClass="table_data_label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
+			<h:outputLabel for="userAccountStatus" styleClass="table-data-label" value="#{msg.ADMIN_USER_ACCOUNT_STATUS}" />
 
-			<h:outputText id="userAccountStatus" styleClass="table_data_field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
+			<h:outputText id="userAccountStatus" styleClass="table-data-field #{beanHelper.user.userAccountStatus.styleClass}" value="#{msg[beanHelper.user.userAccountStatus.messageKey]}" />
 		</h:column>
 
 		<widgets:outputContactDataGridColumns />
diff --git a/web/WEB-INF/templates/admin/user/admin_user_links.tpl b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
index c8e817bf..a95ef3c6 100644
--- a/web/WEB-INF/templates/admin/user/admin_user_links.tpl
+++ b/web/WEB-INF/templates/admin/user/admin_user_links.tpl
@@ -6,14 +6,14 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
 	<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-		<div class="table_header">
+		<div class="table-header">
 			<h:outputText value="#{msg.ADMIN_LINKS_HEADER}" />
 		</div>
 
-		<h:panelGroup styleClass="table_row" layout="block">
+		<h:panelGroup styleClass="table-row" layout="block">
 			<ul>
 				<li>
 					<h:link outcome="admin_edit_user" value="#{msg.ADMIN_LINK_EDIT_USER}" title="#{msg.ADMIN_LINK_EDIT_USER_TITLE}">
@@ -43,7 +43,7 @@
 
 				<li>
 					<h:link outcome="admin_delete_user" title="#{msg.ADMIN_LINK_DELETE_USER_TITLE}">
-						<h:outputText styleClass="delete_link" value="#{msg.ADMIN_LINK_DELETE_USER}" />
+						<h:outputText styleClass="link-danger" value="#{msg.ADMIN_LINK_DELETE_USER}" />
 						<f:param name="userId" value="#{beanHelper.user.userId}" />
 					</h:link>
 				</li>
diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl
index 9ba4f401..a8a4647d 100644
--- a/web/WEB-INF/templates/base.tpl
+++ b/web/WEB-INF/templates/base.tpl
@@ -27,22 +27,20 @@
 			</h:head>
 
 			<h:body>
-				<div id="top">
-					<div id="page_header">
-						<div id="page_title">
-							<h1>
-								<h:outputText value="Addressbook" />
-								<h:outputText value=" - " />
-								<ui:insert name="title">
-									<h:outputText value="Default title" />
-								</ui:insert>
-							</h1>
-						</div>
+				<h:panelGroup styleClass="page-header-container" layout="block">
+					<div id="page-header">
+						<h1>
+							<h:outputText value="Addressbook" />
+							<h:outputText value=" - " />
+							<ui:insert name="title">
+								<h:outputText value="Default title" />
+							</ui:insert>
+						</h1>
 					</div>
-				</div>
+				</h:panelGroup>
 
-				<h:panelGroup id="menu_content" layout="block">
-					<div id="left">
+				<h:panelGroup id="menu-content-wrapper" layout="block">
+					<div id="left-menu-container">
 						<ui:insert name="menu">
 							<h:outputText value="Default menu" />
 						</ui:insert>
@@ -50,8 +48,8 @@
 						<ui:include src="/WEB-INF/templates/widgets/locale_change_widget.tpl" />
 					</div>
 
-					<h:panelGroup id="content_outer" class="left_content" layout="block">
-						<div id="content_header">
+					<h:panelGroup id="content_outer" class="content-container" layout="block">
+						<div id="content-header">
 							<ui:insert name="content_header">
 								<h:outputText value="Default content header" />
 							</ui:insert>
@@ -65,14 +63,14 @@
 					</h:panelGroup>
 				</h:panelGroup>
 
-				<h:panelGroup id="page_footer" layout="block">
+				<h:panelGroup id="page-footer" layout="block">
 					<ui:insert name="footer">
 						<h:outputText value="Default footer" />
 					</ui:insert>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="error_container" layout="block">
-					<h:messages showDetail="true" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					<h:messages showDetail="true" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 				</h:panelGroup>
 			</h:body>
 		</f:view>
diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl
index a42ec3d0..8f10f6e7 100644
--- a/web/WEB-INF/templates/contact/form_contact_data.tpl
+++ b/web/WEB-INF/templates/contact/form_contact_data.tpl
@@ -19,12 +19,12 @@
 
 			<widgets:outputPersonalTitleTableRow targetController="#{contactController}" />
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="firstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="firstName" size="10" maxlength="255" value="#{contactController.firstName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FIRST_NAME_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</h:inputText>
@@ -32,15 +32,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="firstName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="firstName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="familyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="familyName" size="10" maxlength="255" value="#{contactController.familyName}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_FAMILY_NAME_REQUIRED}">
 						<f:validator for="familyName" validatorId="NameValidator" />
 					</h:inputText>
@@ -48,15 +48,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="familyName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="familyName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="street" value="#{msg.PERSONAL_DATA_STREET}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="street" size="20" maxlength="255" value="#{contactController.street}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_STREET_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</h:inputText>
@@ -64,15 +64,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="street" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="street" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="houseNumber" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="houseNumber" size="3" maxlength="5" value="#{contactController.houseNumber}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_HOUSE_NUMBER_REQUIRED}" validatorMessage="#{msg.ENTERED_HOUSE_NUMBER_INVALID}">
 						<f:validateLongRange for="houseNumber" minimum="1" maximum="500" />
 					</h:inputText>
@@ -80,29 +80,29 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="houseNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="houseNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="houseNumberExtension" value="#{msg.PERSONAL_DATA_HOUSE_NUMBER_EXTENSION}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="houseNumberExtension" size="2" maxlength="2" value="#{contactController.houseNumberExtension}" />
 				</div>
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="houseNumberExtension" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="houseNumberExtension" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="zipCode" value="#{msg.PERSONAL_DATA_ZIP_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="zipCode" size="5" maxlength="6" value="#{contactController.zipCode}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_ZIP_CODE_REQUIRED}" validatorMessage="#{msg.ENTERED_ZIP_CODE_INVALID}">
 						<f:validateLongRange minimum="1" maximum="99999" />
 					</h:inputText>
@@ -110,15 +110,15 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="zipCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="zipCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="city" value="#{msg.PERSONAL_DATA_CITY}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="city" size="10" maxlength="255" value="#{contactController.city}" required="true" requiredMessage="#{msg.GUEST_CONTACT_DATA_CITY_REQUIRED}">
 						<f:validator validatorId="NameValidator" />
 					</h:inputText>
@@ -126,15 +126,15 @@
 			</h:panelGroup>
 
 				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="city" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					<h:message for="city" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 				</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="birthday" value="#{msg.PERSONAL_DATA_BIRTHDAY}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:inputText styleClass="input" id="birthday" value="#{contactController.birthday}" required="true" size="10" requiredMessage="#{msg.GUEST_CONTACT_DATA_BIRTHDAY_REQUIRED}" converterMessage="#{msg.INVALID_BIRTHDAY}">
 						<f:convertDateTime pattern="#{msg.BIRTHDAY_PATTERN}" />
 					</h:inputText>
@@ -142,40 +142,40 @@
 			</h:panelGroup>
 
 				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="birthday" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					<h:message for="birthday" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 				</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="country" value="#{msg.PERSONAL_DATA_COUNTRY_CODE}" />
 				</div>
 
-				<div class="table_right_medium">
+				<div class="table-right-medium">
 					<h:selectOneMenu styleClass="select" id="country" value="#{contactController.country}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryCode} (#{msg[country.countryI18nKey]})" />
 					</h:selectOneMenu>
 				</div>
 			</h:panelGroup>
 
 				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="country" errorClass="errors" fatalClass="errors" warnClass="errors" />
+					<h:message for="country" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 				</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="landLineNumber" value="#{msg.PERSONAL_DATA_PHONE_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="landLineCountry" value="#{contactController.landLineCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="landLineCountry" value="#{contactController.landLineCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
+					<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{contactController.landLineAreaCode}">
 						<f:validator validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
@@ -186,26 +186,26 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="landLineAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="landLineNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="landLineNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left_medium">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left-medium">
 					<h:outputLabel for="faxNumber" value="#{msg.PERSONAL_DATA_FAX_NUMBER}" />
 				</div>
 
-				<div class="table_right_medium">
-					<h:selectOneMenu styleClass="select right_space" id="faxCountry" value="#{contactController.faxCountry}">
+				<div class="table-right-medium">
+					<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{contactController.faxCountry}">
 						<f:converter converterId="CountryConverter" />
-						<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+						<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 						<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 					</h:selectOneMenu>
 
-					<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
+					<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{contactController.faxAreaCode}">
 						<f:validator for="faxAreaCode" validatorId="PhoneNumberValidator" />
 					</h:inputText>
 
@@ -216,11 +216,11 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxAreaCode" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="faxAreaCode" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="faxNumber" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="faxNumber" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 
 			<widgets:outputMobileNumberTableRow targetController="#{contactController}" labelMessage="#{msg.PERSONAL_DATA_MOBILE_NUMBER}" />
@@ -235,7 +235,7 @@
 
 			<widgets:outputProfileModeTableRow targetController="#{userController}" labelMessage="#{msg.USER_PROFILE_MODE}" />
 
-			<h:panelGroup styleClass="table_row" layout="block">
+			<h:panelGroup styleClass="table-row" layout="block">
 				<div class="para notice">
 					<ul>
 						<li><h:outputText value="#{msg.SELECTION_NOTICE_USER_PROFILE_MODE_INVISIBLE}" /></li>
diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
index d930846f..b11e37df 100644
--- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl
@@ -6,12 +6,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<h:panelGroup styleClass="table_row" layout="block">
-		<div class="table_left_medium">
+	<h:panelGroup styleClass="table-row" layout="block">
+		<div class="table-left-medium">
 			<h:outputLabel for="emailAddress" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL}" />
 		</div>
 
-		<div class="table_right_medium">
+		<div class="table-right-medium">
 			<h:inputText styleClass="input" id="emailAddress" size="20" maxlength="255" value="#{contactController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 				<f:validator validatorId="EmailAddressValidator" />
 			</h:inputText>
@@ -19,20 +19,20 @@
 	</h:panelGroup>
 
 	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		<h:message for="emailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 	</h:panelGroup>
 
-	<h:panelGroup styleClass="table_row" layout="block">
-		<div class="table_left_medium">
+	<h:panelGroup styleClass="table-row" layout="block">
+		<div class="table-left-medium">
 			<h:outputLabel for="emailAddressRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_EMAIL_REPEAT}" />
 		</div>
 
-		<div class="table_right_medium">
+		<div class="table-right-medium">
 			<h:inputText styleClass="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{contactController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
 		</div>
 	</h:panelGroup>
 
 	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		<h:message for="emailAddressRepeat" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 13f1a363..09ae7da1 100644
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -6,31 +6,31 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<div class="footer">
-		<ul class="footer_nav">
-			<li class="footer_link">
+		<ul class="navbar-horizontal">
+			<li class="navlink-horizontal">
 				<h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" />
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
-				<li class="footer_link">
+				<li class="navlink-horizontal">
 					<h:link outcome="user_resend_link" title="#{msg.LINK_GUEST_RESEND_LINK_TITLE}" value="#{msg.LINK_GUEST_RESEND_LINK}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
-				<li class="footer_link">
+				<li class="navlink-horizontal">
 					<h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
-				<li class="footer_link">
+				<li class="navlink-horizontal">
 					<h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
-				<li class="footer_link">
+				<li class="navlink-horizontal">
 					<h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
 				</li>
 			</ui:fragment>
diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index 778b4946..6410f8ff 100644
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -7,7 +7,7 @@
 
 	<div class="menu_outer">
 		<h:panelGroup styleClass="menu" layout="block">
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.MENU_HOME_TITLE}" />
 			</div>
 
@@ -17,7 +17,7 @@
 				</li>
 			</ul>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.MENU_USER_TITLE}" />
 			</div>
 
diff --git a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
index bb86d274..ee73b84a 100644
--- a/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
+++ b/web/WEB-INF/templates/guest/guest_privacy_terms.tpl
@@ -11,14 +11,14 @@
 				<h:outputText value="#{msg.PRIVACY_TERMS_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left25">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left25">
 					<h:selectBooleanCheckbox styleClass="checkbox" id="privacy" required="true" requiredMessage="#{msg.PRIVACY_POLICY_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="privacy" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
 
-				<div class="table_right75">
+				<div class="table-right75">
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_PRIVACY_STATEMENT_1}" />
 					<h:outputText value="&#160;" />
@@ -28,17 +28,17 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="privacy" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="privacy" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left25">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left25">
 					<h:selectBooleanCheckbox styleClass="checkbox" id="terms" required="true" requiredMessage="#{msg.TERMS_NOT_ACCEPTED_MESSAGE}">
 						<f:validator for="terms" validatorId="PrivacyTermsCheckboxValidator" />
 					</h:selectBooleanCheckbox>
 				</div>
 
-				<div class="table_right75">
+				<div class="table-right75">
 					<!-- @TODO Find something better //-->
 					<h:outputText value="#{msg.GUEST_AGREE_READ_TERMS_CONDITIONS_1}" />
 					<h:outputText value="&#160;" />
@@ -48,7 +48,7 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="terms" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+				<h:message for="terms" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/guest/user/guest_login_form.tpl b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
index 10aee0b6..48a8a828 100644
--- a/web/WEB-INF/templates/guest/user/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/user/guest_login_form.tpl
@@ -8,7 +8,7 @@
 	<h:panelGroup id="user_login_content" layout="block" rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 		<h:form id="form_user_login">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_TITLE}" />
 				</div>
 
@@ -17,44 +17,44 @@
 						<h:outputText value="#{msg.GUEST_ENTER_USER_LOGIN_DATA_LEGEND}" />
 					</legend>
 
-					<h:panelGroup styleClass="table_row" layout="block">
-						<div class="table_left">
+					<h:panelGroup styleClass="table-row" layout="block">
+						<div class="table-left">
 							<h:outputLabel for="userName" value="#{msg.ENTER_USER_NAME}" />
 						</div>
 
-						<div class="table_right">
+						<div class="table-right">
 							<h:inputText styleClass="input" id="userName" value="#{userController.userName}" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
 						</div>
 					</h:panelGroup>
 
 					<h:panelGroup styleClass="error_container" layout="block">
-						<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						<h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 					</h:panelGroup>
 
-					<h:panelGroup styleClass="table_row" layout="block">
-						<div class="table_left">
+					<h:panelGroup styleClass="table-row" layout="block">
+						<div class="table-left">
 							<h:outputLabel for="userPassword" value="#{msg.ENTER_PASSWORD}" />
 						</div>
 
-						<div class="table_right">
+						<div class="table-right">
 							<h:inputSecret styleClass="input" id="userPassword" value="#{userController.userPassword}" size="10" maxlength="255" required="true" requiredMessage="#{msg.LOGIN_NO_PASSWORD_MESSAGE}" />
 						</div>
 					</h:panelGroup>
 
 					<h:panelGroup styleClass="error_container" layout="block">
-						<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+						<h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 					</h:panelGroup>
 				</fieldset>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogin()}" value="#{msg.BUTTON_USER_LOGIN}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
 		<h:panelGroup styleClass="error_container" layout="block" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}">
-			<h:outputText styleClass="errors" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
+			<h:outputText styleClass="alert-danger" value="#{msg.ERROR_GUEST_USER_NAME_REQUIRED_DISABLED}" />
 		</h:panelGroup>
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
index 36eea09e..ec56da69 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page1.tpl
@@ -6,8 +6,8 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:form id="form_register_page1" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-		<h:panelGroup styleClass="table_medium" layout="block">
-			<div class="table_header">
+		<h:panelGroup styleClass="table table-medium" layout="block">
+			<div class="table-header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE1_TITLE}" />
 			</div>
 
@@ -18,18 +18,18 @@
 					</legend>
 
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left_medium">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left-medium">
 								<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
 							</div>
 
-							<div class="table_right_medium">
+							<div class="table-right-medium">
 								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 					</ui:fragment>
 
@@ -38,32 +38,32 @@
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 						<div class="para"></div>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left_medium">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left-medium">
 								<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 							</div>
 
-							<div class="table_right_medium">
+							<div class="table-right-medium">
 								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_NOT_ENTERED}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left_medium">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left-medium">
 								<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 							</div>
 
-							<div class="table_right_medium">
+							<div class="table-right-medium">
 								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" required="#{not featureController.isFeatureEnabled('allow_user_registration_empty_password')}" requiredMessage="#{msg.GUEST_REGISTRATION_PASSWORD_REPEAT_NOT_ENTERED}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 
 						<div class="para notice">
@@ -83,8 +83,8 @@
 
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-			<div class="table_footer">
-				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+			<div class="table-footer">
+				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" id="continueRegisterPage1" value="#{msg.BUTTON_CONTINUE_REGISTER_PAGE2}" action="#{userRegistrationController.doRegisterMultiPage1()}" />
 			</div>
 		</h:panelGroup>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
index b695fece..eecb4942 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_page2.tpl
@@ -6,15 +6,15 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:form id="form_register_page2" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-		<h:panelGroup styleClass="table_medium" layout="block">
-			<div class="table_header">
+		<h:panelGroup styleClass="table table-medium" layout="block">
+			<div class="table-header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_PAGE2_TITLE}" />
 			</div>
 
 			<ui:include src="/WEB-INF/templates/contact/form_contact_data.tpl" />
 
-			<div class="table_footer">
-				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+			<div class="table-footer">
+				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
 			</div>
 		</h:panelGroup>
diff --git a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
index a3c7829d..16505b77 100644
--- a/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
+++ b/web/WEB-INF/templates/guest/user/register/guest_form_register_single.tpl
@@ -6,8 +6,8 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:form id="form_register_single" rendered="#{featureController.isFeatureEnabled('user_registration')}">
-		<h:panelGroup styleClass="table_medium" layout="block">
-			<div class="table_header">
+		<h:panelGroup styleClass="table table-medium" layout="block">
+			<div class="table-header">
 				<h:outputText value="#{msg.GUEST_REGISTRATION_TITLE}" />
 			</div>
 
@@ -20,18 +20,18 @@
 					</legend>
 
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left">
 								<h:outputLabel for="userName" value="#{msg.GUEST_REGISTRATION_ENTER_USER_NAME}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table-right">
 								<h:inputText styleClass="input" id="userName" size="20" maxlength="255" value="#{userController.userName}" required="true" requiredMessage="#{msg.GUEST_REGISTRATION_USER_NAME_NOT_ENTERED}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userName" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userName" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 					</ui:fragment>
 
@@ -40,32 +40,32 @@
 					<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
 						<div class="para"></div>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left">
 								<h:outputLabel for="userPassword" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table-right">
 								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userController.userPassword}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left">
 								<h:outputLabel for="userPasswordRepeat" value="#{msg.GUEST_REGISTRATION_ENTER_PASSWORD_REPEAT}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table-right">
 								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userController.userPasswordRepeat}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 
 						<div class="para notice">
@@ -87,8 +87,8 @@
 
 			<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-			<div class="table_footer">
-				<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+			<div class="table-footer">
+				<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 				<h:commandButton styleClass="submit" type="submit" id="finish_registration_single" value="#{msg.BUTTON_FINISH_REGISTRATION}" action="#{userRegistrationController.doFinishRegistration()}" />
 			</div>
 		</h:panelGroup>
diff --git a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
index c5b59fc9..94b2cfdd 100644
--- a/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/fax_input_fields.tpl
@@ -6,16 +6,16 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="phoneCountry" value="#{targetController.phoneCountry}">
+		<h:selectOneMenu styleClass="select divider-right" id="faxCountry" value="#{targetController.faxCountry}">
 			<f:converter converterId="CountryConverter" />
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 			<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 		</h:selectOneMenu>
 
-		<h:inputText styleClass="input right_space" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+		<h:inputText styleClass="input divider-right" id="faxAreaCode" size="5" maxlength="10" value="#{targetController.faxAreaCode}">
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 
diff --git a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
index 181a04e1..8de46d3e 100644
--- a/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
+++ b/web/WEB-INF/templates/input_fields/landline_input_fields.tpl
@@ -6,16 +6,16 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBoxMini message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" styleClass="errors" rendered="#{empty targetController}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_TARGET_CONTROLLER_NOT_SET}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{empty targetController}" />
 
 	<ui:fragment rendered="#{not empty targetController}">
-		<h:selectOneMenu styleClass="select right_space" id="countryPhoneCode" value="#{targetController.phoneCountry}">
+		<h:selectOneMenu styleClass="select divider-right" id="countryPhoneCode" value="#{targetController.landLineCountry}">
 			<f:converter converterId="CountryConverter" />
-			<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+			<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 			<f:selectItems value="#{countryController.allCountries()}" var="country" itemValue="#{country}" itemLabel="#{country.countryAbroadDialPrefix}#{country.countryPhoneCode}" />
 		</h:selectOneMenu>
 
-		<h:inputText styleClass="input right_space" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.phoneAreaCode}">
+		<h:inputText styleClass="input divider-right" id="landLineAreaCode" size="5" maxlength="10" value="#{targetController.landLineAreaCode}">
 			<f:validator validatorId="PhoneNumberValidator" />
 		</h:inputText>
 
diff --git a/web/WEB-INF/templates/login/user/user_base.tpl b/web/WEB-INF/templates/login/user/user_base.tpl
index 8b576f32..9732eb92 100644
--- a/web/WEB-INF/templates/login/user/user_base.tpl
+++ b/web/WEB-INF/templates/login/user/user_base.tpl
@@ -7,14 +7,15 @@
 	xmlns:h="http://xmlns.jcp.org/jsf/html">
 
 	<ui:define name="title">
-		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA}" -  />
+		<h:outputText value="#{msg.PAGE_TITLE_USER_LOGIN_AREA} - " />
+
 		<ui:insert name="login_title">
 			<h:outputText value="Default login title" />
 		</ui:insert>
 	</ui:define>
 
 	<ui:define name="menu">
-		<widgets:outputMessageBoxMini message="#{msg.USER_NOT_LOGGED_IN}" styleClass="errors" rendered="#{not userLoginController.isUserLoggedIn()}" />
+		<widgets:outputMessageBox message="#{msg.USER_NOT_LOGGED_IN}" boxStyleClass="message-full" messageStyleClass="alert-danger" rendered="#{not userLoginController.isUserLoggedIn()}" />
 
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/login/user/user_menu.tpl" />
diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
index 090520cf..f57c93e3 100644
--- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
+++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl
@@ -6,12 +6,12 @@
 	xmlns:f="http://xmlns.jcp.org/jsf/core"
 	>
 
-	<h:panelGroup styleClass="table_row" layout="block">
-		<div class="table_left">
-			<h:outputLabel for="emailAddress" value="#{msg.LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL}" />
+	<h:panelGroup styleClass="table-row" layout="block">
+		<div class="table-left">
+			<h:outputLabel for="emailAddress" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL}" />
 		</div>
 
-		<div class="table_right">
+		<div class="table-right">
 			<h:inputText class="input" id="emailAddress" size="20" maxlength="255" value="#{userEmailChangeController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}" validatorMessage="#{msg.ENTERED_EMAIL_ADDRESS_IS_INVALID}">
 				<f:validator validatorId="EmailAddressValidator" />
 			</h:inputText>
@@ -19,20 +19,20 @@
 	</h:panelGroup>
 
 	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		<h:message for="emailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 	</h:panelGroup>
 
-	<h:panelGroup styleClass="table_row" layout="block">
-		<div class="table_left">
-			<h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_USER_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
+	<h:panelGroup styleClass="table-row" layout="block">
+		<div class="table-left">
+			<h:outputLabel for="emailAddressRepeat" value="#{msg.LOGIN_CHANGE_EMAIL_ENTER_EMAIL_REPEAT}" />
 		</div>
 
-		<div class="table_right">
+		<div class="table-right">
 			<h:inputText class="input" id="emailAddressRepeat" size="20" maxlength="255" value="#{userEmailChangeController.emailAddressRepeat}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_REPEAT_NOT_ENTERED}" />
 		</div>
 	</h:panelGroup>
 
 	<h:panelGroup styleClass="error_container" layout="block">
-		<h:message for="emailAddressRepeat" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+		<h:message for="emailAddressRepeat" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
index ad94b3b9..10dcc088 100644
--- a/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
+++ b/web/WEB-INF/templates/login/user/user_enter_current_password.tpl
@@ -11,12 +11,12 @@
 				<h:outputText value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRMATION_LEGEND}" />
 			</legend>
 
-			<h:panelGroup styleClass="table_row" layout="block">
-				<div class="table_left">
+			<h:panelGroup styleClass="table-row" layout="block">
+				<div class="table-left">
 					<h:outputLabel for="currentPassword" value="#{msg.LOGIN_ENTER_CURRENT_PASSWORD_CONFIRM}" />
 				</div>
 
-				<div class="table_right">
+				<div class="table-right">
 					<h:inputSecret styleClass="input" id="currentPassword" size="10" maxlength="255" value="#{userLoginController.userCurrentPassword}" required="true" validatorMessage="#{msg.ERROR_USER_CURRENT_PASSWORD_MISMATCHING}">
 						<!-- <f:validator for="currentPassword" validatorId="UserPasswordValidator" /> //-->
 					</h:inputSecret>
@@ -24,7 +24,7 @@
 			</h:panelGroup>
 
 			<h:panelGroup styleClass="error_container" layout="block">
-				<h:message for="currentPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+				<h:message for="currentPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 			</h:panelGroup>
 		</fieldset>
 	</h:panelGroup>
diff --git a/web/WEB-INF/templates/login/user/user_footer.tpl b/web/WEB-INF/templates/login/user/user_footer.tpl
index 5682983c..ec6d264c 100644
--- a/web/WEB-INF/templates/login/user/user_footer.tpl
+++ b/web/WEB-INF/templates/login/user/user_footer.tpl
@@ -6,25 +6,25 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<div class="footer">
-		<ul class="footer_nav">
-			<li class="footer_link">
+		<ul class="navbar-horizontal">
+			<li class="navlink-horizontal">
 				<h:link outcome="login_index" title="#{msg.LINK_LOGIN_HOME_TITLE}" value="#{msg.LINK_LOGIN_HOME}" />
 			</li>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('imprint')}">
-				<li class="footer_link">
+				<li class="navlink-horizontal">
 					<h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('terms')}">
-				<li class="footer_link">
+				<li class="navlink-horizontal">
 					<h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" />
 				</li>
 			</ui:fragment>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('privacy')}">
-				<li class="footer_link">
+				<li class="navlink-horizontal">
 					<h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" />
 				</li>
 			</ui:fragment>
diff --git a/web/WEB-INF/templates/login/user/user_menu.tpl b/web/WEB-INF/templates/login/user/user_menu.tpl
index 59e33252..bda47989 100644
--- a/web/WEB-INF/templates/login/user/user_menu.tpl
+++ b/web/WEB-INF/templates/login/user/user_menu.tpl
@@ -7,7 +7,7 @@
 
 	<div class="menu_outer">
 		<h:panelGroup styleClass="menu" layout="block">
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.MENU_HOME_TITLE}" />
 			</div>
 
@@ -28,7 +28,7 @@
 			</ul>
 
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('change_user_personal_data') or featureController.isFeatureEnabled('change_user_password') or featureController.isFeatureEnabled('user_change_email_address')}">
-				<div class="menu_header">
+				<div class="menu-header">
 					<h:outputText value="#{msg.MENU_USER_EDIT_PROFILE_TITLE}" />
 				</div>
 
@@ -53,7 +53,7 @@
 				</ul>
 			</ui:fragment>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.MENU_APPLICATIONS_TITLE}" />
 			</div>
 
@@ -63,7 +63,7 @@
 				</li>
 			</ul>
 
-			<div class="menu_header">
+			<div class="menu-header">
 				<h:outputText value="#{msg.MENU_LOGOUT_TITLE}" />
 			</div>
 
diff --git a/web/WEB-INF/templates/user/user_not_logged_in.tpl b/web/WEB-INF/templates/user/user_not_logged_in.tpl
index b8a98d6b..a50b340e 100644
--- a/web/WEB-INF/templates/user/user_not_logged_in.tpl
+++ b/web/WEB-INF/templates/user/user_not_logged_in.tpl
@@ -10,8 +10,8 @@
 			<h:outputText value="#{msg.TABLE_HEADER_ERROR_USER_NOT_LOGGED_IN}" />
 		</div>
 
-		<div class="para errors">
-			<h:outputText value="#{msg.USER_IS_NOT_LOGGED_IN_FULL}" />
+		<div class="para">
+			<h:outputText styleClass="alert-danger" value="#{msg.USER_IS_NOT_LOGGED_IN_FULL}" />
 		</div>
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/templates/user/user_profile_link.tpl b/web/WEB-INF/templates/user/user_profile_link.tpl
index ef2dade0..6eff0a40 100644
--- a/web/WEB-INF/templates/user/user_profile_link.tpl
+++ b/web/WEB-INF/templates/user/user_profile_link.tpl
@@ -6,7 +6,7 @@
 	xmlns:h="http://java.sun.com/jsf/html"
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
-	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" styleClass="errors" rendered="#{empty user}" />
+	<widgets:outputMessageBox message="#{msg.ERROR_PARAMETER_USER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty user}" />
 
 	<h:outputText styleClass="notice" value="#{msg.USER_PROFILE_NOT_PUBLICLY_VISIBLE}" rendered="#{not empty user and not profileController.isProfileLinkVisibleByUser(user)}" />
 
diff --git a/web/WEB-INF/templates/user/userid_error.tpl b/web/WEB-INF/templates/user/userid_error.tpl
index 0d45fc32..1e3c4082 100644
--- a/web/WEB-INF/templates/user/userid_error.tpl
+++ b/web/WEB-INF/templates/user/userid_error.tpl
@@ -6,12 +6,12 @@
 	xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
 
 	<h:panelGroup styleClass="table" layout="block">
-		<div class="table_header">
+		<div class="table-header">
 			<h:outputText value="#{msg.TABLE_HEADER_ERROR_HANDLING_USER_ID}" />
 		</div>
 
 		<div class="para">
-			<h:messages errorClass="errors" fatalClass="fatals" infoClass="infos" warnClass="warnings" showDetail="true" />
+			<h:messages errorClass="alert-danger" fatalClass="alert-danger" infoClass="infos" warnClass="alert-warning" showDetail="true" />
 		</div>
 	</h:panelGroup>
 </ui:composition>
diff --git a/web/WEB-INF/widgets.jsf.taglib.xml b/web/WEB-INF/widgets.jsf.taglib.xml
index 61d3769b..aa4259be 100644
--- a/web/WEB-INF/widgets.jsf.taglib.xml
+++ b/web/WEB-INF/widgets.jsf.taglib.xml
@@ -37,30 +37,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 			<type>java.lang.Boolean</type>
 		</attribute>
 		<attribute>
-			<name>styleClass</name>
-			<description>The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message.</description>
+			<name>boxStyleClass</name>
+			<description>The optional CSS style class to be forwarded to the container div of the whole message box. Default is ".message_box" .</description>
 			<required>false</required>
 			<type>java.lang.String</type>
 		</attribute>
-	</tag>
-	<tag>
-		<tag-name>outputMessageBoxMini</tag-name>
-		<description>This tag renders a style-able and customizable mini message for any kind of messages that the user should see. It is similar to outputMessageBox tag but it renders a smaller box instead.</description>
-		<source>resources/tags/messages/message_box_mini.tpl</source>
-		<attribute>
-			<name>message</name>
-			<description>The message that should be place into the message box. You may also use EL code here that resolves to a message string.</description>
-			<required>true</required>
-			<type>java.lang.String</type>
-		</attribute>
-		<attribute>
-			<name>rendered</name>
-			<description>Whether this tag is being rendered by JSF engine.</description>
-			<required>false</required>
-			<type>java.lang.Boolean</type>
-		</attribute>
 		<attribute>
-			<name>styleClass</name>
+			<name>messageStyleClass</name>
 			<description>The optional CSS style class to be forwarded on the h:outputText's styleClass attribute of the message. The default is "okay" which normally renders as a green colored message.</description>
 			<required>false</required>
 			<type>java.lang.String</type>
diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml
index 70fa64a7..d385e3b8 100644
--- a/web/admin/admin_logout.xhtml
+++ b/web/admin/admin_logout.xhtml
@@ -16,7 +16,7 @@
 	<ui:define name="content">
 		<h:form id="form_admin_logout">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_LOGOUT_TITLE}" />
 				</div>
 
@@ -24,7 +24,7 @@
 					<h:outputText value="#{msg.ADMIN_LOGOUT_NOTICE}" />
 				</h:panelGroup>
 
-				<div class="table_footer">
+				<div class="table-footer">
 					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doAdminLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/business_contacts/admin_business_contacts_list.xhtml b/web/admin/business_contacts/admin_business_contacts_list.xhtml
index 51f5e9c8..e64935f7 100644
--- a/web/admin/business_contacts/admin_business_contacts_list.xhtml
+++ b/web/admin/business_contacts/admin_business_contacts_list.xhtml
@@ -15,9 +15,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" styleClass="errors" rendered="#{companyDataController.allCompanyBasicData().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_BUSINESS_BASIC_DATA_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{companyDataController.allCompanyBasicData().isEmpty()}" />
 
-		<h:dataTable id="table_list_business_contacts" var="companyData" value="#{companyDataController.allCompanyBasicData()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not companyDataController.allCompanyBasicData().isEmpty()}">
+		<h:dataTable id="table_list_business_contacts" var="companyData" value="#{companyDataController.allCompanyBasicData()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_BUSINESS_BASIC_DATA}" rendered="#{not companyDataController.allCompanyBasicData().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_BUSINESS_BASIC_DATA_ID}" />
@@ -92,8 +92,8 @@
 		</h:dataTable>
 
 		<h:form id="form_admin_add_business_basic_data">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_BUSINESS_BASIC_DATA_TITLE}" />
 				</div>
 
@@ -103,8 +103,8 @@
 
 				<ui:include src="/WEB-INF/templates/admin/business_basic_data/admin_form_business_basic_data.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="add_business_basic_data" value="#{msg.BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON}" action="#{adminCompanyDataController.addBusinessBasicData()}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/contact/admin_contact_delete.xhtml b/web/admin/contact/admin_contact_delete.xhtml
index d5bbb266..f8fcb08b 100644
--- a/web/admin/contact/admin_contact_delete.xhtml
+++ b/web/admin/contact/admin_contact_delete.xhtml
@@ -22,11 +22,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 		<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_DELETE_CONTACT_TITLE}">
 						<f:param value="#{beanHelper.contact.contactId}" />
 					</h:outputFormat>
@@ -38,9 +38,9 @@
 
 				<ui:include src="/WEB-INF/templates/admin/contact/admin_show_contact_data.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="delete_button" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton styleClass="button-danger" type="submit" id="delete_contact" value="#{msg.BUTTON_ADMIN_DELETE_CONTACT}" action="#{adminContactController.deleteContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/contact/admin_contact_edit.xhtml b/web/admin/contact/admin_contact_edit.xhtml
index aae001b1..0835fd47 100644
--- a/web/admin/contact/admin_contact_edit.xhtml
+++ b/web/admin/contact/admin_contact_edit.xhtml
@@ -22,11 +22,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 		<h:form id="form_admin_edit_user" rendered="#{not empty beanHelper.contact}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_CONTACT_TITLE}">
 						<f:param value="#{beanHelper.contact.contactId}" />
 					</h:outputFormat>
@@ -40,8 +40,8 @@
 					<ui:param name="mode" value="edit" />
 				</ui:include>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="edit_contact" value="#{msg.BUTTON_ADMIN_EDIT_CONTACT}" action="#{adminContactController.editContactData()}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/contact/admin_contact_export.xhtml b/web/admin/contact/admin_contact_export.xhtml
index 403c9c04..2ac0f0f9 100644
--- a/web/admin/contact/admin_contact_export.xhtml
+++ b/web/admin/contact/admin_contact_export.xhtml
@@ -16,10 +16,10 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" styleClass="errors" rendered="#{contactController.allContacts().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{contactController.allContacts().isEmpty()}" />
 
 		<h:form id="form_export_contacts" rendered="#{not contactController.allContacts().isEmpty()}">
-			<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
+			<p:dataTable id="table_export_contacts" var="contact" value="#{contactController.allContacts()}" tableStyleClass="table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_CONTACT}">
 				<p:column exportable="false">
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_CONTACT_ID}" />
@@ -155,8 +155,8 @@
 				</p:column>
 			</p:dataTable>
 
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TITLE}" />
 				</div>
 
@@ -164,7 +164,7 @@
 					<h:outputText value="#{msg.ADMIN_EXPORT_CONTACTS_TIMEOUT_WARNING}" />
 				</div>
 
-				<div class="table_footer">
+				<div class="table-footer">
 					<h:commandButton styleClass="submit" type="submit" id="export_contacts_xls" value="#{msg.BUTTON_ADMIN_EXPORT_CONTACTS_XLS}">
 						<p:dataExporter type="xls" target="table_export_contacts" fileName="all_contacts" />
 					</h:commandButton>
diff --git a/web/admin/contact/admin_contact_list.xhtml b/web/admin/contact/admin_contact_list.xhtml
index 3024149a..a2b8c2a0 100644
--- a/web/admin/contact/admin_contact_list.xhtml
+++ b/web/admin/contact/admin_contact_list.xhtml
@@ -15,9 +15,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" styleClass="errors" rendered="#{contactController.allContacts().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_CONTACT_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{contactController.allContacts().isEmpty()}" />
 
-		<h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
+		<h:dataTable id="table_list_contacts" var="contact" value="#{contactController.allContacts()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_CONTACT}" rendered="#{not contactController.allContacts().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_CONTACT_ID}" />
@@ -72,8 +72,8 @@
 		</h:dataTable>
 
 		<h:form id="form_admin_add_contact">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_CONTACT_TITLE}" />
 				</div>
 
@@ -85,8 +85,8 @@
 					<ui:param name="allowEmptyRequiredData" value="true" />
 				</ui:include>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="add_contact" value="#{msg.BUTTON_ADMIN_ADD_CONTACT}" action="#{adminContactController.addContact()}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/contact/admin_contact_show.xhtml b/web/admin/contact/admin_contact_show.xhtml
index 1b7add6b..810e2310 100644
--- a/web/admin/contact/admin_contact_show.xhtml
+++ b/web/admin/contact/admin_contact_show.xhtml
@@ -22,7 +22,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_CONTACT_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
 		<ui:fragment rendered="#{not empty beanHelper.contact}">
 			<h:panelGroup styleClass="para" layout="block">
diff --git a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
index 45a8427b..2ac7ddb0 100644
--- a/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_fax_unlink.xhtml
@@ -24,7 +24,7 @@
 	<ui:define name="content">
 		<h:form id="form_unlink_contact_fax" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber == beanHelper.faxNumber}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_FAX_NUMBER_TITLE}" />
 				</div>
 
@@ -45,19 +45,19 @@
 					</ui:include>
 				</div>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="unlink_button" type="submit" id="unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="button-warning" type="submit" id="unlink_fax" value="#{msg.BUTTON_ADMIN_UNLINK_FAX_NUMBER}" action="#{adminContactPhoneController.unlinkFaxContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
-			<f:param value="#{beanHelper.faxNumber.phoneId}" />
-			<f:param value="#{beanHelper.contact.contactId}" />
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_FAX_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.faxNumber and not empty beanHelper.contact and beanHelper.contact.contactFaxNumber != beanHelper.faxNumber}">
+			<f:param value="#{adminContactPhoneController.phoneId}" />
+			<f:param value="#{adminContactPhoneController.contact.contactId}" />
 		</h:outputFormat>
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
index f1189be1..fb5e086b 100644
--- a/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_landline_unlink.xhtml
@@ -24,7 +24,7 @@
 	<ui:define name="content">
 		<h:form id="form_unlink_contact_landline" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber == beanHelper.landLineNumber}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_LAND_LINE_NUMBER_TITLE}" />
 				</div>
 
@@ -45,17 +45,17 @@
 					</ui:include>
 				</div>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="unlink_button" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="button-warning" type="submit" id="unlink_landline" value="#{msg.BUTTON_ADMIN_UNLINK_LAND_LINE_NUMBER}" action="#{adminContactPhoneController.unlinkLandLineContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_LAND_LINE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.landLineNumber and not empty beanHelper.contact and beanHelper.contact.contactLandLineNumber != beanHelper.landLineNumber}">
 			<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 			<f:param value="#{beanHelper.contact.contactId}" />
 		</h:outputFormat>
diff --git a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
index 1c7bcbea..c6ac5964 100644
--- a/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
+++ b/web/admin/contact/unlink/admin_contact_mobile_unlink.xhtml
@@ -24,7 +24,7 @@
 	<ui:define name="content">
 		<h:form id="form_unlink_contact_mobile" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber == beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_UNLINK_CONTACT_MOBILE_NUMBER_TITLE}" />
 				</div>
 
@@ -45,17 +45,17 @@
 					</ui:include>
 				</div>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="unlink_button" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="button-warning" type="submit" id="unlink_mobile" value="#{msg.BUTTON_ADMIN_UNLINK_MOBILE_NUMBER}" action="#{adminContactPhoneController.unlinkMobileContactData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.contact}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_CONTACT_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.contact}" />
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_MOBILE_NUMBER_CONTACT_NOT_LINKED}" rendered="#{not empty beanHelper.mobileNumber and not empty beanHelper.contact and beanHelper.contact.contactMobileNumber != beanHelper.mobileNumber}">
 			<f:param value="#{beanHelper.mobileNumber.phoneId}" />
 			<f:param value="#{beanHelper.contact.contactId}" />
 		</h:outputFormat>
diff --git a/web/admin/country/admin_country_list.xhtml b/web/admin/country/admin_country_list.xhtml
index 3498fbd0..831eca61 100644
--- a/web/admin/country/admin_country_list.xhtml
+++ b/web/admin/country/admin_country_list.xhtml
@@ -14,7 +14,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
+		<h:dataTable id="table_list_countries" var="country" value="#{countryController.allCountries()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_COUNTRIES}" rendered="#{not countryController.allCountries().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_COUNTRY_DATA_COUNTRY_ID}" />
@@ -51,15 +51,15 @@
 		</h:dataTable>
 
 		<h:form id="form_add_country">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_COUNTRY_TITLE}" />
 				</div>
 
 				<ui:include src="/WEB-INF/templates/admin/country/admin_form_country_data.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="add_country" value="#{msg.BUTTON_ADMIN_ADD_COUNTRY}" action="#{adminCountryController.addCountry()}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/fax/admin_fax_delete.xhtml b/web/admin/fax/admin_fax_delete.xhtml
index 71b1adb2..a1d048db 100644
--- a/web/admin/fax/admin_fax_delete.xhtml
+++ b/web/admin/fax/admin_fax_delete.xhtml
@@ -24,7 +24,7 @@
 	<ui:define name="content">
 		<h:form id="form_delete_fax" rendered="#{not empty beanHelper.faxNumber}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_DELETE_FAX_TITLE}" />
 				</div>
 
@@ -39,12 +39,12 @@
 					<h:outputText value="#{msg.ADMIN_DELETE_FAX_DATA_NOTICE}" />
 				</div>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="delete_button" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="button-danger" type="submit" id="delete_fax" value="#{msg.BUTTON_ADMIN_DELETE_FAX}" action="#{adminPhoneController.deleteFaxData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/fax/admin_fax_edit.xhtml b/web/admin/fax/admin_fax_edit.xhtml
index bd0b2858..81562422 100644
--- a/web/admin/fax/admin_fax_edit.xhtml
+++ b/web/admin/fax/admin_fax_edit.xhtml
@@ -23,8 +23,8 @@
 
 	<ui:define name="content">
 		<h:form id="form_edit_fax" rendered="#{not empty beanHelper.faxNumber}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_FAX_NUMBER_TITLE}">
 						<f:param value="#{beanHelper.faxNumber.phoneId}" />
 					</h:outputFormat>
@@ -32,13 +32,13 @@
 
 				<ui:include src="/WEB-INF/templates/admin/fax/admin_form_fax_data.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="edit_fax" value="#{msg.BUTTON_ADMIN_EDIT_FAX_NUMBER}" action="#{adminPhoneController.doChangeFaxNumber()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.faxNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_FAX_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.faxNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/fax/admin_fax_list.xhtml b/web/admin/fax/admin_fax_list.xhtml
index ee19c313..019fcef3 100644
--- a/web/admin/fax/admin_fax_list.xhtml
+++ b/web/admin/fax/admin_fax_list.xhtml
@@ -15,7 +15,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
+		<h:dataTable id="table_list_fax" var="faxNumber" value="#{phoneController.allFaxNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_FAXS}" rendered="#{not phoneController.allFaxNumbers().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
@@ -55,6 +55,6 @@
 			</h:column>
 		</h:dataTable>
 
-		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" styleClass="errors" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_FAX_NUMBER_EMPTY}" styleClass="alert-danger" rendered="#{phoneController.allFaxNumbers().isEmpty()}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/fax/admin_fax_show.xhtml b/web/admin/fax/admin_fax_show.xhtml
index 8d736fe5..80e06a10 100644
--- a/web/admin/fax/admin_fax_show.xhtml
+++ b/web/admin/fax/admin_fax_show.xhtml
@@ -25,7 +25,7 @@
 			<ui:param name="isShowPage" value="true" />
 		</ui:include>
 
-		<h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+		<h:dataTable id="contact_fax_link" var="contact" value="#{contactPhoneController.allCurrentFaxNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_FAX_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.faxNumber.phoneId}" />
@@ -33,53 +33,53 @@
 			</f:facet>
 
 			<h:column>
-				<h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+				<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<h:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</h:link>
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+				<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-				<h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+				<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+				<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-				<h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+				<h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+				<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-				<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+				<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+				<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-				<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+				<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+				<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
 			</h:column>
 
 			<h:column>
-				<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+				<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-				<div class="table_data_field">
-					<ul class="mini_nav">
-						<li class="mini_link">
+				<div class="table-data-field">
+					<ul class="navbar-mini">
+						<li class="navlink-mini">
 							<h:link outcome="admin_unlink_contact_fax">
-								<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.faxNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</h:link>
diff --git a/web/admin/landline/admin_landline_delete.xhtml b/web/admin/landline/admin_landline_delete.xhtml
index c54daa7b..55ef8fa7 100644
--- a/web/admin/landline/admin_landline_delete.xhtml
+++ b/web/admin/landline/admin_landline_delete.xhtml
@@ -24,7 +24,7 @@
 	<ui:define name="content">
 		<h:form id="form_delete_landline" rendered="#{not empty beanHelper.landLineNumber}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_TITLE}" />
 				</div>
 
@@ -39,12 +39,12 @@
 					<h:outputText value="#{msg.ADMIN_DELETE_LAND_LINE_DATA_NOTICE}" />
 				</div>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="delete_button" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="button-danger" type="submit" id="delete_landline" value="#{msg.BUTTON_ADMIN_DELETE_LAND_LINE}" action="#{adminPhoneController.deleteLandLineData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_edit.xhtml b/web/admin/landline/admin_landline_edit.xhtml
index 26cf8cfb..42cc7150 100644
--- a/web/admin/landline/admin_landline_edit.xhtml
+++ b/web/admin/landline/admin_landline_edit.xhtml
@@ -23,8 +23,8 @@
 
 	<ui:define name="content">
 		<h:form id="form_edit_landline" rendered="#{not empty beanHelper.landLineNumber}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_LAND_LINE_NUMBER_TITLE}">
 						<f:param value="#{beanHelper.landLineNumber.phoneId}" />
 					</h:outputFormat>
@@ -32,13 +32,13 @@
 
 				<ui:include src="/WEB-INF/templates/admin/landline/admin_form_landline_data.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="edit_landline" value="#{msg.BUTTON_ADMIN_EDIT_LAND_LINE_NUMBER}" action="#{adminPhoneController.doChangeLandLineNumber()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.landLineNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_LAND_LINE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.landLineNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_list.xhtml b/web/admin/landline/admin_landline_list.xhtml
index 476e41de..c615e6e1 100644
--- a/web/admin/landline/admin_landline_list.xhtml
+++ b/web/admin/landline/admin_landline_list.xhtml
@@ -15,7 +15,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
+		<h:dataTable id="table_list_landline" var="landLineNumber" value="#{phoneController.allLandLineNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_LAND_LINES}" rendered="#{not phoneController.allLandLineNumbers().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
@@ -55,6 +55,6 @@
 			</h:column>
 		</h:dataTable>
 
-		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" styleClass="errors" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_LAND_LINE_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allLandLineNumbers().isEmpty()}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/landline/admin_landline_show.xhtml b/web/admin/landline/admin_landline_show.xhtml
index c5d2293c..8bcc57bc 100644
--- a/web/admin/landline/admin_landline_show.xhtml
+++ b/web/admin/landline/admin_landline_show.xhtml
@@ -25,7 +25,7 @@
 			<ui:param name="isShowPage" value="true" />
 		</ui:include>
 
-		<h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+		<h:dataTable id="contact_landline_link" var="contact" value="#{contactPhoneController.allCurrentLandLineNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_LAND_LINE_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.landLineNumber.phoneId}" />
@@ -33,54 +33,54 @@
 			</f:facet>
 
 			<h:column>
-				<h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+				<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
 				<h:link id="contactId" outcome="admin_show_contact">
-					<h:outputText styleClass="table_data_field" value="#{contact.contactId}" />
+					<h:outputText styleClass="table-data-field" value="#{contact.contactId}" />
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</h:link>
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+				<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-				<h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+				<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+				<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-				<h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+				<h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+				<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-				<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+				<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+				<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-				<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+				<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+				<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
 			</h:column>
 
 			<h:column>
-				<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+				<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-				<div class="table_data_field">
-					<ul class="mini_nav">
-						<li class="mini_link">
+				<div class="table-data-field">
+					<ul class="navbar-mini">
+						<li class="navlink-mini">
 							<h:link outcome="admin_unlink_contact_landline">
-								<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.landLineNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</h:link>
diff --git a/web/admin/mobile/admin_contact_mobile_list.xhtml b/web/admin/mobile/admin_contact_mobile_list.xhtml
index 9534375a..43800111 100644
--- a/web/admin/mobile/admin_contact_mobile_list.xhtml
+++ b/web/admin/mobile/admin_contact_mobile_list.xhtml
@@ -14,7 +14,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_big" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+		<h:dataTable id="table_list_mobiles" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_NUMBERS}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_MOBILE_ID}" />
diff --git a/web/admin/mobile/admin_mobile_delete.xhtml b/web/admin/mobile/admin_mobile_delete.xhtml
index d77d6ce5..4a61ccc0 100644
--- a/web/admin/mobile/admin_mobile_delete.xhtml
+++ b/web/admin/mobile/admin_mobile_delete.xhtml
@@ -24,7 +24,7 @@
 	<ui:define name="content">
 		<h:form id="form_delete_mobile" rendered="#{not empty beanHelper.mobileNumber}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_TITLE}" />
 				</div>
 
@@ -39,12 +39,12 @@
 					<h:outputText value="#{msg.ADMIN_DELETE_MOBILE_DATA_NOTICE}" />
 				</div>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="delete_button" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="button-danger" type="submit" id="delete_mobile" value="#{msg.BUTTON_ADMIN_DELETE_MOBILE_NUMBER}" action="#{adminPhoneController.deleteMobileData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_mobile_edit.xhtml b/web/admin/mobile/admin_mobile_edit.xhtml
index 4dbefe68..411e9dde 100644
--- a/web/admin/mobile/admin_mobile_edit.xhtml
+++ b/web/admin/mobile/admin_mobile_edit.xhtml
@@ -23,8 +23,8 @@
 
 	<ui:define name="content">
 		<h:form id="form_edit_mobile" rendered="#{not empty beanHelper.mobileNumber}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_EDIT_MOBILE_NUMBER_TITLE}">
 						<f:param value="#{beanHelper.mobileNumber.phoneId}" />
 					</h:outputFormat>
@@ -32,13 +32,13 @@
 
 				<ui:include src="/WEB-INF/templates/admin/mobile/admin_form_mobile_data.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="edit_mobile" value="#{msg.BUTTON_ADMIN_EDIT_MOBILE_NUMBER}" action="#{adminPhoneController.doUpdateMobileNumber()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" styleClass="errors" rendered="#{empty beanHelper.mobileNumber}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_BEAN_HELPER_MOBILE_NUMBER_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.mobileNumber}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_mobile_list.xhtml b/web/admin/mobile/admin_mobile_list.xhtml
index ded4c7b1..ff224432 100644
--- a/web/admin/mobile/admin_mobile_list.xhtml
+++ b/web/admin/mobile/admin_mobile_list.xhtml
@@ -15,7 +15,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
+		<h:dataTable id="table_list_mobile" var="mobile" value="#{phoneController.allMobileNumbers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILES}" rendered="#{not phoneController.allMobileNumbers().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_SHOW_PHONE_ID}" />
@@ -65,6 +65,6 @@
 			</h:column>
 		</h:dataTable>
 
-		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_MOBILE_EMPTY}" styleClass="errors" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_LIST_MOBILE_EMPTY}" messageStyleClass="alert-danger" rendered="#{phoneController.allMobileNumbers().isEmpty()}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/admin/mobile/admin_mobile_show.xhtml b/web/admin/mobile/admin_mobile_show.xhtml
index 744d1813..fdbbf0fd 100644
--- a/web/admin/mobile/admin_mobile_show.xhtml
+++ b/web/admin/mobile/admin_mobile_show.xhtml
@@ -25,7 +25,7 @@
 			<ui:param name="isShowPage" value="true" />
 		</ui:include>
 
-		<h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table_header_column" styleClass="table_medium">
+		<h:dataTable id="contact_mobile_link" var="contact" value="#{contactPhoneController.allCurrentMobileNumberContacts()}" summary="#{msg.TABLE_SUMMARY_ADMIN_SHOW_ADMINISTRATIVE_LINKS}" headerClass="table-header-column" styleClass="table table-medium">
 			<f:facet name="header">
 				<h:outputFormat value="#{msg.ADMIN_HEADER_SHOW_MOBILE_NUMBER_LINKS}">
 					<f:param value="#{beanHelper.mobileNumber.phoneId}" />
@@ -33,53 +33,53 @@
 			</f:facet>
 
 			<h:column>
-				<h:outputLabel for="contactId" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ID}" />
+				<h:outputLabel for="contactId" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ID}" />
 
-				<h:link id="contactId" styleClass="table_data_field" outcome="admin_show_contact" value="#{contact.contactId}">
+				<h:link id="contactId" styleClass="table-data-field" outcome="admin_show_contact" value="#{contact.contactId}">
 					<f:param name="contactId" value="#{contact.contactId}" />
 				</h:link>
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactPersonalTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
+				<h:outputLabel for="contactPersonalTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_PERSONAL_TITLE}" />
 
-				<h:outputText id="contactPersonalTitle" styleClass="table_data_field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
+				<h:outputText id="contactPersonalTitle" styleClass="table-data-field" value="#{msg[contact.contactPersonalTitle.messageKey]}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactTitle" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
+				<h:outputLabel for="contactTitle" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_ACADEMIC_TITLE}" />
 
-				<h:outputText id="contactTitle" styleClass="table_data_field" value="#{contact.contactTitle}" />
+				<h:outputText id="contactTitle" styleClass="table-data-field" value="#{contact.contactTitle}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactFirstName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
+				<h:outputLabel for="contactFirstName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FIRST_NAME}" />
 
-				<h:outputText id="contactFirstName" styleClass="table_data_field" value="#{contact.contactFirstName}" />
+				<h:outputText id="contactFirstName" styleClass="table-data-field" value="#{contact.contactFirstName}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactFamilyName" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
+				<h:outputLabel for="contactFamilyName" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_FAMILY_NAME}" />
 
-				<h:outputText id="contactFamilyName" styleClass="table_data_field" value="#{contact.contactFamilyName}" />
+				<h:outputText id="contactFamilyName" styleClass="table-data-field" value="#{contact.contactFamilyName}" />
 			</h:column>
 
 			<h:column>
-				<h:outputLabel for="contactEmailAddress" styleClass="table_data_label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
+				<h:outputLabel for="contactEmailAddress" styleClass="table-data-label" value="#{msg.ADMIN_CONTACT_EMAIL_ADDRESS}" />
 
-				<h:outputLink id="contactEmailAddress" styleClass="table_data_field" value="mailto:#{contact.contactEmailAddress}">
+				<h:outputLink id="contactEmailAddress" styleClass="table-data-field" value="mailto:#{contact.contactEmailAddress}">
 					<h:outputText value="#{contact.contactEmailAddress}" />
 				</h:outputLink>
 			</h:column>
 
 			<h:column>
-				<h:outputLabel styleClass="table_data_label" value="#{msg.ADMIN_UNLINK_DATA}" />
+				<h:outputLabel styleClass="table-data-label" value="#{msg.ADMIN_UNLINK_DATA}" />
 
-				<div class="table_data_field">
-					<ul class="mini_nav">
-						<li class="mini_link">
+				<div class="table-data-field">
+					<ul class="navbar-mini">
+						<li class="navlink-mini">
 							<h:link outcome="admin_unlink_contact_mobile">
-								<h:outputText styleClass="unlink_link" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
+								<h:outputText styleClass="link-warning" value="#{msg.ADMIN_LINK_UNLINK_SHORT}" title="#{msg.ADMIN_LINK_UNLINK_SHORT_TITLE}" />
 								<f:param name="phoneId" value="#{beanHelper.mobileNumber.phoneId}" />
 								<f:param name="contactId" value="#{contact.contactId}" />
 							</h:link>
diff --git a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
index 0a7ac749..6beca962 100644
--- a/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
+++ b/web/admin/mobile_provider/admin_mobile_provider_list.xhtml
@@ -14,7 +14,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table_medium" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
+		<h:dataTable id="table_list_mobile" var="mobile" value="#{mobileProviderController.allMobileProviders()}" styleClass="table table-medium" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_MOBILE_PROVIDERS}" rendered="#{not mobileProviderController.allMobileProviders().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_MOBILE_PROVIDER_ID}" />
@@ -61,15 +61,15 @@
 		</h:dataTable>
 
 		<h:form id="form_add_mobile_provider">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_MOBILE_PROVIDER_TITLE}" />
 				</div>
 
 				<ui:include src="/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="add_mobile_provider" value="#{msg.BUTTON_ADMIN_ADD_MOBILE_PROVIDER}" action="#{adminMobileProviderController.addMobileProvider()}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/user/admin_user_activity_log.xhtml b/web/admin/user/admin_user_activity_log.xhtml
index 12f2fb96..7d93ed7e 100644
--- a/web/admin/user/admin_user_activity_log.xhtml
+++ b/web/admin/user/admin_user_activity_log.xhtml
@@ -22,9 +22,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
-		<h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
+		<h:dataTable id="table_user_activity_log" var="userActivity" value="#{userActivityController.fetchCurrentUsersActivityLog()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USER_ACTIVITY_LOG}" rendered="#{not empty beanHelper.user}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_LIST_USER_ID}" />
diff --git a/web/admin/user/admin_user_delete.xhtml b/web/admin/user/admin_user_delete.xhtml
index c6afca17..31212c78 100644
--- a/web/admin/user/admin_user_delete.xhtml
+++ b/web/admin/user/admin_user_delete.xhtml
@@ -22,11 +22,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
 		<h:form id="form_admin_delete_user" rendered="#{not empty beanHelper.user}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_DELETE_USER_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
 						<f:param value="#{beanHelper.user.userId}" />
@@ -39,19 +39,19 @@
 
 				<ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data_mini.tpl" />
 
-				<h:panelGroup styleClass="table_row" layout="block">
-					<div class="table_left25_medium">
+				<h:panelGroup styleClass="table-row" layout="block">
+					<div class="table-left25-medium">
 						<h:outputLabel for="userDeleteReason" value="#{msg.ADMIN_USER_DELETE_REASON}" />
 					</div>
 
-					<div class="table_right75_medium">
+					<div class="table-right75-medium">
 						<h:inputTextarea id="userDeleteReason" styleClass="input" value="#{adminUserController.userDeleteReason}" rows="8" cols="45" />
 					</div>
 				</h:panelGroup>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-					<h:commandButton styleClass="delete_button" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<h:commandButton styleClass="button-danger" type="submit" id="delete_user" value="#{msg.BUTTON_ADMIN_DELETE_USER}" action="#{adminUserController.deleteUserData()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
diff --git a/web/admin/user/admin_user_edit.xhtml b/web/admin/user/admin_user_edit.xhtml
index a4fe7425..da978232 100644
--- a/web/admin/user/admin_user_edit.xhtml
+++ b/web/admin/user/admin_user_edit.xhtml
@@ -22,11 +22,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
 		<h:form id="form_edit_user" rendered="#{not empty beanHelper.user}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_EDIT_USER_TITLE}" />
 				</div>
 
@@ -38,8 +38,8 @@
 					<ui:param name="mode" value="edit" />
 				</ui:include>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="edit_user" value="#{msg.BUTTON_ADMIN_EDIT_USER}" action="#{adminUserController.editUserData()}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/admin/user/admin_user_export.xhtml b/web/admin/user/admin_user_export.xhtml
index f33d68da..e2542a2b 100644
--- a/web/admin/user/admin_user_export.xhtml
+++ b/web/admin/user/admin_user_export.xhtml
@@ -16,10 +16,10 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
 
 		<h:form id="form_export_users" rendered="#{not userController.allUsers().isEmpty()}">
-			<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table_full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
+			<p:dataTable id="table_export_users" var="user" value="#{userController.allUsers()}" tableStyleClass="table-full" paginator="true" rows="10" summary="#{msg.TABLE_SUMMARY_ADMIN_EXPORT_USER}">
 				<p:column exportable="false">
 					<f:facet name="header">
 						<h:outputText value="#{msg.ADMIN_EXPORT_USER_ID}" />
@@ -173,8 +173,8 @@
 				</p:column>
 			</p:dataTable>
 
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TITLE}" />
 				</div>
 
@@ -182,7 +182,7 @@
 					<h:outputText value="#{msg.ADMIN_EXPORT_USERS_TIMEOUT_WARNING}" />
 				</div>
 
-				<div class="table_footer">
+				<div class="table-footer">
 					<h:commandButton styleClass="submit" type="submit" id="export_users_xls" value="#{msg.BUTTON_ADMIN_EXPORT_USERS_XLS}">
 						<p:dataExporter type="xls" target="table_export_users" fileName="all_users" />
 					</h:commandButton>
diff --git a/web/admin/user/admin_user_list.xhtml b/web/admin/user/admin_user_list.xhtml
index 30cc21b3..f08378c9 100644
--- a/web/admin/user/admin_user_list.xhtml
+++ b/web/admin/user/admin_user_list.xhtml
@@ -15,9 +15,9 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" styleClass="errors" rendered="#{userController.allUsers().isEmpty()}" />
+		<widgets:outputMessageBox message="#{msg.ADMIN_USER_LIST_EMPTY}" messageStyleClass="alert-danger" rendered="#{userController.allUsers().isEmpty()}" />
 
-		<h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table_full" headerClass="table_header_column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
+		<h:dataTable id="table_list_users" var="user" value="#{userController.allUsers()}" styleClass="table-full" headerClass="table-header-column" summary="#{msg.TABLE_SUMMARY_ADMIN_LIST_USERS}" rendered="#{not userController.allUsers().isEmpty()}">
 			<h:column>
 				<f:facet name="header">
 					<h:outputText value="#{msg.ADMIN_USER_ID}" />
@@ -89,9 +89,9 @@
 			</h:column>
 		</h:dataTable>
 
-		<h:panelGroup styleClass="table_medium" layout="block">
+		<h:panelGroup styleClass="table table-medium" layout="block">
 			<h:form id="form_admin_add_user">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.ADMIN_ADD_USER_TITLE}" />
 				</div>
 
@@ -102,14 +102,14 @@
 							<h:outputText value="#{msg.ADMIN_SELECT_USER_CONTACT_LEGEND}" />
 						</legend>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left_medium">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left-medium">
 								<h:outputLabel for="userContact" value="#{msg.ADMIN_SELECT_USER_CONTACT}" />
 							</div>
 
-							<div class="table_right_medium">
-								<h:selectOneMenu styleClass="select" id="userContact" value="#{beanHelper.contact}" converter="ContactConverter">
-									<f:selectItem itemValue="" itemLabel="#{msg.NONE_SELECTED}" />
+							<div class="table-right-medium">
+								<h:selectOneMenu styleClass="select" id="userContact" value="#{adminUserController.contact}" converter="ContactConverter">
+									<f:selectItem itemValue="#{null}" itemLabel="#{msg.NONE_SELECTED}" />
 									<f:selectItems value="#{contactController.selectableContacts()}" var="contact" itemValue="#{contact}" itemLabel="#{contact.contactId}: #{msg[contact.contactPersonalTitle.messageKey]} #{contact.contactFirstName} #{contact.contactFamilyName}" />
 								</h:selectOneMenu>
 							</div>
@@ -126,8 +126,8 @@
 					<ui:include src="/WEB-INF/templates/admin/user/admin_form_user_personal_data.tpl" />
 				</h:panelGroup>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="add_user" value="#{msg.BUTTON_ADMIN_ADD_USER}" action="#{adminUserController.addUser()}" />
 				</div>
 			</h:form>
diff --git a/web/admin/user/admin_user_lock.xhtml b/web/admin/user/admin_user_lock.xhtml
index 5a7ef3db..9c5be085 100644
--- a/web/admin/user/admin_user_lock.xhtml
+++ b/web/admin/user/admin_user_lock.xhtml
@@ -22,71 +22,71 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
 		<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'CONFIRMED'}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_LOCK_USER_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
 						<f:param value="#{beanHelper.user.userId}" />
 					</h:outputFormat>
 				</div>
 
-				<h:panelGroup styleClass="table_row" layout="block">
-					<div class="table_left_medium">
+				<h:panelGroup styleClass="table-row" layout="block">
+					<div class="table-left-medium">
 						<h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
 					</div>
 
-					<div class="table_right_medium">
+					<div class="table-right-medium">
 						<h:outputFormat id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
 					</div>
 				</h:panelGroup>
 
-				<h:panelGroup styleClass="table_row" layout="block">
-					<div class="table_left_medium">
+				<h:panelGroup styleClass="table-row" layout="block">
+					<div class="table-left-medium">
 						<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 					</div>
 
-					<div class="table_right_medium">
+					<div class="table-right-medium">
 						<h:outputFormat id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
 					</div>
 				</h:panelGroup>
 
-				<h:panelGroup styleClass="table_row" layout="block">
-					<div class="table_left_medium">
+				<h:panelGroup styleClass="table-row" layout="block">
+					<div class="table-left-medium">
 						<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 					</div>
 
-					<div class="table_right_medium">
+					<div class="table-right-medium">
 						<h:outputFormat id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
 					</div>
 				</h:panelGroup>
 
-				<h:panelGroup styleClass="table_row" layout="block">
-					<div class="table_left_medium">
+				<h:panelGroup styleClass="table-row" layout="block">
+					<div class="table-left-medium">
 						<h:outputLabel for="userLockReason" value="#{msg.ADMIN_ENTER_USER_LOCK_REASON}" />
 					</div>
 
-					<div class="table_right_medium">
+					<div class="table-right-medium">
 						<h:inputTextarea styleClass="input" id="userLockReason" value="#{adminUserController.userLockReason}" cols="50" rows="10" required="true" requiredMessage="#{msg.ADMIN_USER_UNLOCK_REASON_REQUIRED}" />
 					</div>
 				</h:panelGroup>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
 					<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.lockUserAccount()}" value="#{msg.BUTTON_ADMIN_LOCK_USER_ACCOUNT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_LOCK_USER_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/admin/user/admin_user_resend_confirmation_link.xhtml b/web/admin/user/admin_user_resend_confirmation_link.xhtml
index 4e15d492..74b2cb58 100644
--- a/web/admin/user/admin_user_resend_confirmation_link.xhtml
+++ b/web/admin/user/admin_user_resend_confirmation_link.xhtml
@@ -22,11 +22,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
 		<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
 						<f:param value="#{beanHelper.user.userId}" />
@@ -41,20 +41,20 @@
 					<h:outputText styleClass="notice" value="#{msg.ADMIN_RESEND_USER_CONFIRMATION_LINK_NOTICE}" />
 				</h:panelGroup>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
 					<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.resendConfirmationLink()}" value="#{msg.BUTTON_ADMIN_RESEND_USER_CONFIRMATION_LINK_ACCOUNT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_RESEND_USER_CONFIRMATION_LINK_ACCOUNT_LOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'LOCKED'}">
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/admin/user/admin_user_show.xhtml b/web/admin/user/admin_user_show.xhtml
index c535aa89..37c80d32 100644
--- a/web/admin/user/admin_user_show.xhtml
+++ b/web/admin/user/admin_user_show.xhtml
@@ -22,7 +22,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
 		<ui:include src="/WEB-INF/templates/admin/user/admin_show_user_data.tpl" />
 
diff --git a/web/admin/user/admin_user_unlock.xhtml b/web/admin/user/admin_user_unlock.xhtml
index 11dc6c34..7b80ca88 100644
--- a/web/admin/user/admin_user_unlock.xhtml
+++ b/web/admin/user/admin_user_unlock.xhtml
@@ -22,11 +22,11 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_ID_NOT_FOUND}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 
 		<h:form id="form_admin_user_unlock" rendered="#{not empty beanHelper.user and beanHelper.user.userAccountStatus == 'LOCKED'}">
-			<h:panelGroup styleClass="table_medium" layout="block">
-				<div class="table_header">
+			<h:panelGroup styleClass="table table-medium" layout="block">
+				<div class="table-header">
 					<h:outputFormat value="#{msg.ADMIN_UNLOCK_USER_TITLE}">
 						<f:param value="#{beanHelper.user.userName}" />
 						<f:param value="#{beanHelper.user.userId}" />
@@ -34,11 +34,11 @@
 				</div>
 
 				<h:panelGroup styleClass="para" layout="block">
-					<div class="table_data_label">
+					<div class="table-data-label">
 						<h:outputText value="#{msg.ADMIN_SHOW_USER_ID}" />
 					</div>
 
-					<div class="table_data_field">
+					<div class="table-data-field">
 						<h:link outcome="admin_show_user" title="#{msg.ADMIN_LINK_SHOW_USER_TITLE}" value="#{beanHelper.user.userId}">
 							<f:param name="userId" value="#{beanHelper.user.userId}" />
 						</h:link>
@@ -46,41 +46,41 @@
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="para" layout="block">
-					<div class="table_data_label">
+					<div class="table-data-label">
 						<h:outputLabel for="contactPersonalTitle" value="#{msg.PERSONAL_DATA_PERSONAL_TITLE}" />
 					</div>
 
-					<div class="table_data_field">
+					<div class="table-data-field">
 						<h:outputText id="contactPersonalTitle" value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="para" layout="block">
-					<div class="table_data_label">
+					<div class="table-data-label">
 						<h:outputLabel for="contactFirstName" value="#{msg.PERSONAL_DATA_FIRST_NAME}" />
 					</div>
 
-					<div class="table_data_field">
+					<div class="table-data-field">
 						<h:outputText id="contactFirstName" value="#{beanHelper.user.userContact.contactFirstName}" />
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="para" layout="block">
-					<div class="table_data_label">
+					<div class="table-data-label">
 						<h:outputLabel for="contactFamilyName" value="#{msg.PERSONAL_DATA_FAMILY_NAME}" />
 					</div>
 
-					<div class="table_data_field">
+					<div class="table-data-field">
 						<h:outputText id="contactFamilyName" value="#{beanHelper.user.userContact.contactFamilyName}" />
 					</div>
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="para" layout="block">
-					<div class="table_data_label">
+					<div class="table-data-label">
 						<h:outputLabel for="userLastLocked" value="#{msg.ADMIN_USER_LAST_LOCKED}" />
 					</div>
 
-					<div class="table_data_field">
+					<div class="table-data-field">
 						<h:outputText id="userLastLocked" value="#{beanHelper.user.userLastLocked.time}">
 							<f:convertDateTime for="userLastLocked" type="both" />
 						</h:outputText>
@@ -88,29 +88,29 @@
 				</h:panelGroup>
 
 				<h:panelGroup styleClass="para" layout="block">
-					<div class="table_data_label">
+					<div class="table-data-label">
 						<h:outputLabel for="userLockReason" value="#{msg.ADMIN_USER_LAST_LOCKED_REASON}" />
 					</div>
 
-					<div class="table_data_field">
+					<div class="table-data-field">
 						<h:outputText id="userLockReason" value="#{beanHelper.user.userLastLockedReason}" />
 					</div>
 				</h:panelGroup>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 
 					<h:commandButton styleClass="submit" type="submit" action="#{adminUserController.unlockUserAccount()}" value="#{msg.BUTTON_ADMIN_UNLOCK_USER_ACCOUNT}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNCONFIRMED}" rendered="#{beanHelper.user.userAccountStatus == 'UNCONFIRMED'}">
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
 
-		<h:outputFormat styleClass="errors" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
+		<h:outputFormat styleClass="alert-danger" value="#{msg.ERROR_ADMIN_CANNOT_UNLOCK_USER_ACCOUNT_UNLOCKED}" rendered="#{beanHelper.user.userAccountStatus == 'CONFIRMED'}">
 			<f:param value="#{beanHelper.user.userName}" />
 			<f:param value="#{beanHelper.user.userId}" />
 		</h:outputFormat>
diff --git a/web/guest/user/user_confirm_account.xhtml b/web/guest/user/user_confirm_account.xhtml
index dd9774d3..cd128315 100644
--- a/web/guest/user/user_confirm_account.xhtml
+++ b/web/guest/user/user_confirm_account.xhtml
@@ -24,11 +24,11 @@
 	<ui:define name="content">
 		<ui:fragment rendered="#{not empty userConfirmationLinkController.confirmationKey}">
 			<h:panelGroup styleClass="table" layout="block" rendered="#{not empty beanHelper.user}">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.GUEST_CONFIRM_USER_ACCOUNT_DONE_TITLE}" />
 				</div>
 
-				<h:panelGroup styleClass="table_row" layout="block">
+				<h:panelGroup styleClass="table-row" layout="block">
 					<h:outputFormat value="#{msg.GUEST_USER_CONFIRM_ACCOUNT_DONE}">
 						<f:param value="#{msg[beanHelper.user.userContact.contactPersonalTitle.messageKey]}" />
 						<f:param value="#{beanHelper.user.userContact.contactFirstName}" />
@@ -37,9 +37,9 @@
 				</h:panelGroup>
 			</h:panelGroup>
 
-			<widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" styleClass="errors" rendered="#{empty beanHelper.user}" />
+			<widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_LINK_INVALID}" messageStyleClass="alert-danger" rendered="#{empty beanHelper.user}" />
 		</ui:fragment>
 
-		<widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" styleClass="errors" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
+		<widgets:outputMessageBox message="#{msg.GUEST_CONFIRMATION_KEY_NOT_SET}" messageStyleClass="alert-danger" rendered="#{empty userConfirmationLinkController.confirmationKey}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_list.xhtml b/web/guest/user/user_list.xhtml
index 842385a2..0332d854 100644
--- a/web/guest/user/user_list.xhtml
+++ b/web/guest/user/user_list.xhtml
@@ -15,12 +15,12 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:panelGroup styleClass="table_full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
-			<div class="table_header">
+		<h:panelGroup styleClass="table-full" layout="block" rendered="#{featureController.isFeatureEnabled('user_list')}">
+			<div class="table-header">
 				<h:outputText value="#{msg.TABLE_HEADER_USER_LIST}" />
 			</div>
 
-			<h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
+			<h:dataTable id="userList" var="user" value="#{userController.allVisibleUsers()}" headerClass="table-header-column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isVisibleUserFound()}">
 				<h:column>
 					<f:facet name="header">
 						<h:outputText value="#{msg.USER_NAME}" />
@@ -41,6 +41,6 @@
 			</h:dataTable>
 		</h:panelGroup>>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_USER_LIST_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_list')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_login.xhtml b/web/guest/user/user_login.xhtml
index 5a3130ee..6e744173 100644
--- a/web/guest/user/user_login.xhtml
+++ b/web/guest/user/user_login.xhtml
@@ -33,6 +33,6 @@
 			</h:panelGroup>
 		</ui:fragment>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_LOGIN_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_lost_password.xhtml b/web/guest/user/user_lost_password.xhtml
index 47d3c460..cfbada39 100644
--- a/web/guest/user/user_lost_password.xhtml
+++ b/web/guest/user/user_lost_password.xhtml
@@ -19,7 +19,7 @@
 			<div id="user_lost_password_content">
 				<h:form id="form_lost_password">
 					<h:panelGroup styleClass="table" layout="block">
-						<div class="table_header">
+						<div class="table-header">
 							<h:outputText value="#{msg.GUEST_LOST_PASSWORD_TITLE}" />
 						</div>
 
@@ -28,33 +28,33 @@
 								<h:outputText value="#{msg.GUEST_LOST_PASSWORD_LEGEND}" />
 							</legend>
 
-							<h:panelGroup styleClass="table_row" layout="block">
-								<div class="table_left">
+							<h:panelGroup styleClass="table-row" layout="block">
+								<div class="table-left">
 									<h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
 								</div>
 
-								<div class="table_right">
+								<div class="table-right">
 									<h:inputText styleClass="input" id="id" size="10" maxlength="20" value="#{passwordRecoveryController.userId}" />
 								</div>
 							</h:panelGroup>
 
-							<div class="table_header">
+							<div class="table-header">
 								<h:outputText value="#{msg.GUEST_LOST_PASSWORD_NUMBER_OR_EMAIL}" />
 							</div>
 
-							<h:panelGroup styleClass="table_row" layout="block">
-								<div class="table_left">
+							<h:panelGroup styleClass="table-row" layout="block">
+								<div class="table-left">
 									<h:outputLabel for="email" value="#{msg.ENTER_EMAIL_ADDRESS}" />
 								</div>
 
-								<div class="table_right">
+								<div class="table-right">
 									<h:inputText styleClass="input" id="email" size="20" maxlength="255" value="#{passwordRecoveryController.emailAddress}" />
 								</div>
 							</h:panelGroup>
 						</fieldset>
 
-						<div class="table_footer">
-							<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+						<div class="table-footer">
+							<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 							<h:commandButton styleClass="submit" type="submit" value="#{msg.BUTTON_CONTINUE_STEP_2}" action="#{passwordRecoveryController.doLostPasswordStep2()}" />
 						</div>
 					</h:panelGroup>
@@ -62,6 +62,6 @@
 			</div>
 		</ui:fragment>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RECOVER_PASSWORD_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_login_require_user_name') or not featureController.isFeatureEnabled('user_password_recovery')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_profile.xhtml b/web/guest/user/user_profile.xhtml
index d1f84f15..a021c3ea 100644
--- a/web/guest/user/user_profile.xhtml
+++ b/web/guest/user/user_profile.xhtml
@@ -31,11 +31,11 @@
 				<ui:include src="/WEB-INF/templates/user/userid_error.tpl" />
 			</ui:fragment>
 
-			<widgets:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" styleClass="errors" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
+			<widgets:outputMessageBox message="#{msg.ERROR_PROFILE_NOT_VISIBLE}" messageStyleClass="alert-danger" rendered="#{not profileController.isProfileLinkVisibleById(userController.userId)}" />
 
 			<ui:fragment rendered="#{profileController.isProfileLinkVisibleById(userController.userId)}">
 				<div align="center">
-					<h:panelGrid styleClass="table" headerClass="table_header" footerClass="table_footer">
+					<h:panelGrid styleClass="table" headerClass="table-header" footerClass="table-footer">
 						<f:facet name="header">
 							<h:outputText value="#{msg.PUBLIC_USER_PROFILE}" />
 						</f:facet>
@@ -45,6 +45,6 @@
 			</ui:fragment>
 		</ui:fragment>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" styleClass="errors" rendered="#{not userController.isPublicUserProfileEnabled()}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_PROFILE_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not userController.isPublicUserProfileEnabled()}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_register.xhtml b/web/guest/user/user_register.xhtml
index 0d6ebf81..25eee963 100644
--- a/web/guest/user/user_register.xhtml
+++ b/web/guest/user/user_register.xhtml
@@ -35,8 +35,8 @@
 			</h:panelGroup>
 		</ui:fragment>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_registration')}" />
 
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" styleClass="errors" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTRATION_IN_INDEX_ENABLED}" messageStyleClass="alert-danger" rendered="#{featureController.isFeatureEnabled('user_registration_in_index')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/guest/user/user_register_page2.xhtml b/web/guest/user/user_register_page2.xhtml
index c65dbad0..658b73ee 100644
--- a/web/guest/user/user_register_page2.xhtml
+++ b/web/guest/user/user_register_page2.xhtml
@@ -15,7 +15,7 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_REGISTER_MULTIPLE_PAGE_NOT_ENABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_register_multiple_page')}" />
 
 		<ui:fragment rendered="#{featureController.isFeatureEnabled('user_register_multiple_page')}">
 			<ui:fragment rendered="#{featureController.isFeatureEnabled('user_login_require_user_name')}">
diff --git a/web/guest/user/user_resend_link.xhtml b/web/guest/user/user_resend_link.xhtml
index 285ec9ad..ca1280e3 100644
--- a/web/guest/user/user_resend_link.xhtml
+++ b/web/guest/user/user_resend_link.xhtml
@@ -17,7 +17,7 @@
 	<ui:define name="content">
 		<h:form id="form_resend_link" rendered="#{featureController.isFeatureEnabled('user_resend_confirmation_link')}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.GUEST_RESEND_LINK_TITLE}" />
 				</div>
 
@@ -26,12 +26,12 @@
 						<h:outputText value="#{msg.RESEND_CONFIRMATION_LINK_LEGEND}" />
 					</legend>
 
-					<h:panelGroup styleClass="table_row" layout="block">
-						<div class="table_left">
+					<h:panelGroup styleClass="table-row" layout="block">
+						<div class="table-left">
 							<h:outputLabel for="resendEmailAddress" value="#{msg.GUEST_RESEND_LINK_ENTER_EMAIL_ADDRESS}" />
 						</div>
 
-						<div class="table_right">
+						<div class="table-right">
 							<h:inputText styleClass="input" id="resendEmailAddress" size="20" maxlength="255" value="#{userResendConfirmationController.emailAddress}" required="true" requiredMessage="#{msg.EMAIL_ADDRESS_NOT_ENTERED}">
 								<f:validator validatorId="EmailAddressValidator" />
 							</h:inputText>
@@ -40,20 +40,20 @@
 				</fieldset>
 
 				<h:panelGroup styleClass="error_container" layout="block">
-					<h:message for="resendEmailAddress" errorClass="errors" warnClass="warnings" fatalClass="errors" />
+					<h:message for="resendEmailAddress" errorClass="alert-danger" warnClass="alert-warning" fatalClass="alert-danger" />
 				</h:panelGroup>
 
-				<h:panelGroup styleClass="table_row" layout="block">
+				<h:panelGroup styleClass="table-row" layout="block">
 					<h:outputText value="#{msg.GUEST_RESEND_CONFIRMATION_LINK_NOTICE}" />
 				</h:panelGroup>
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="resend_link" value="#{msg.BUTTON_RESEND_CONFIRMATION_LINK}" action="#{userResendConfirmationController.doResendLink()}" />
 				</div>
 			</h:panelGroup>
 		</h:form>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_resend_confirmation_link')}" />
 	</ui:define>
 </ui:composition>
diff --git a/web/resources/css/default.css b/web/resources/css/default.css
index 3d226fe7..9a84a100 100644
--- a/web/resources/css/default.css
+++ b/web/resources/css/default.css
@@ -1,9 +1,10 @@
 body {
-	background-color: #ffffff;
+	background-color: white;
 	font-size: 12px;
 	font-family: sans-serif;
-	color: #000000;
+	color: black;
 	margin: 0px;
+	line-height: 14px;
 }
 
 h1 {
diff --git a/web/resources/css/layout.css b/web/resources/css/layout.css
index f86f0a3b..03c3e9d6 100644
--- a/web/resources/css/layout.css
+++ b/web/resources/css/layout.css
@@ -4,68 +4,62 @@ div, table {
 }
 /**/
 
-#page_title {
-	border-bottom: 1px solid #AFAFAF;
+#page-header {
+	border-bottom: 1px solid grey;
+	line-height: 20px;
 }
 
-#top {
+.page-header-container {
 	position: relative;
-	background-color: #036fab;
-	color: #ffffff;
+	background-color: steelblue;
+	color: white;
 	padding: 5px;
 	margin: 0px 0px 10px 0px;
 }
 
-#page_footer {
+#page-footer {
 	position: relative;
-	background-color: #c2dfef;
+	background-color: lightblue;
 	padding: 5px;
 	margin: 10px 0px 0px 0px;
 }
 
-#left {
+#left-menu-container {
 	float: left;
-	background-color: #ece3a5;
+	background-color: khaki;
 	padding: 5px;
 	width: 170px;
 }
 
-#right {
-	float: right;
-	background-color: #ece3a5;
-	padding: 5px;
-	width: 150px;
-}
-
 .center_content {
 	position: relative;
 	background-color: #dddddd;
 	padding: 5px;
 }
 
-.left_content {
+.content-container {
 	padding-right: 5px;
 	padding-bottom: 5px;
 	margin-left: 190px;
 }
 
-.table_footer {
+.table-footer {
 	margin: 2px;
 }
 
-#top a:link, #top a:visited {
-	color: #ffffff;
+.page-header-container a:link, .page-header-container a:visited {
+	color: white;
 	font-weight : bold;
 	text-decoration: none;
 }
 
-#top a:link:hover, #top a:visited:hover  {
-	color: #000000;
+.page-header-container a:link:hover, .page-header-container a:visited:hover  {
+	color: black;
 	font-weight : bold;
 	text-decoration : underline;
 }
 
-table, .table, .table_medium {
+table, .table, .table-medium {
 	margin: 0px;
 	padding: 0px;
 }
@@ -74,68 +68,69 @@ table, .table, .table_medium {
 	width: 500px;
 }
 
-.table_footer {
+.table-footer {
 	margin: 2px;
 }
 
-.table_medium {
+.table-medium {
 	width: 650px;
 }
 
-.table_full {
+.table-full {
+	margin: 0 auto;
 	width: 100%;
 }
 
-.table_row {
+.table-row {
 	width: 100%;
 	min-height: 20px;
 	margin: 2px;
 	overflow: auto;
 }
 
-.table_left {
+.table-left {
 	width: 250px;
 	min-height: 20px;
 	float: left;
 }
 
-.table_right {
+.table-right {
 	width: 200px;
 	min-height: 20px;
 	float: right;
 }
 
-.table_left25 {
+.table-left25 {
 	width: 20px;
 	min-height: 20px;
 	float: left;
 }
 
-.table_right75 {
+.table-right75 {
 	width: 430px;
 	min-height: 20px;
 	float: right;
 }
 
-.table_left_medium {
+.table-left-medium {
 	width: 300px;
 	min-height: 20px;
 	float: left;
 }
 
-.table_right_medium {
+.table-right-medium {
 	width: 300px;
 	min-height: 20px;
 	float: right;
 }
 
-.table_left25_medium {
+.table-left25-medium {
 	width: 150px;
 	min-height: 20px;
 	float: left;
 }
 
-.table_right75_medium {
+.table-right75-medium {
 	width: 490px;
 	min-height: 20px;
 	float: right;
@@ -145,7 +140,7 @@ table, .table, .table_medium {
 	padding: 5px;
 }
 
-ul.footer_nav, ul.mini_nav {
+ul.navbar-horizontal, ul.navbar-mini {
 	display: block;
 	text-align: center;
 	list-style: none;
@@ -153,20 +148,20 @@ ul.footer_nav, ul.mini_nav {
 	padding: 0px;
 }
 
-ul.footer_nav li.footer_link, ul.mini_nav li.mini_link {
+ul.navbar-horizontal li.navlink-horizontal, ul.navbar-mini li.navlink-mini {
 	display: block;
 	float: left;
 }
 
-ul.footer_nav li.footer_link {
+ul.navbar-horizontal li.navlink-horizontal {
 	width: 100px;
 }
 
-ul.mini_nav li.mini_link {
+ul.navbar-mini li.navlink-mini {
 	padding: 1px;
 }
 
-ul.footer_nav li.footer_copyright {
+ul.navbar-horizontal li.footer_copyright {
 	float: right;
 	width: 300px;
 	margin-right: 10px;
@@ -177,30 +172,30 @@ ul.footer_nav li.footer_copyright {
 	padding-left: 5px;
 }
 
-.menu_header {
+.menu-header {
 	font-weight: bold;
 }
 
-.table_header, .table_label, .message_header {
+.table-header {
 	text-align: center;
 	font-weight: bold;
 }
 
-.table_data_label, .table_data_field {
+.table-data-label, .table-data-field {
 	display: block;
 	border: 1px solid #aaaaaa;
 	border-top-right-radius: 8px;
 	border-bottom-left-radius: 8px;
 }
 
-.table_data_label {
+.table-data-label {
 	font-weight: bold;
-	background-image: linear-gradient(#eeeeee, #bbbbbb);
+	background-image: linear-gradient(#eeeeee, #aaaaaa);
 	height: 16px;
 	padding-left: 4px;
 }
 
-.table_data_field {
+.table-data-field {
 	background-color: #f5f5f5;
 	vertical-align: top;
 	padding-top: 1px;
@@ -211,24 +206,25 @@ ul.footer_nav li.footer_copyright {
 	min-height: 15px;
 }
 
-#content_header {
-	border-color: #888888;
+#content-header {
+	border-color: grey;
 	background-image: linear-gradient(#eeeeee, #aaaaaa);
 	font-weight: bold;
 	font-size: 18px;
 	margin-bottom: 20px;
 	padding-left: 5px;
+	line-height: 20px;
 }
 
-.table_header_column {
+.table-header-column {
 	width: 100px;
 }
 
-.table_header_column25 {
+.table-header-column25 {
 	width: 25%;
 }
 
-.table_data_column {
+.table-data-column {
 	width: 100px;
 }
 
@@ -236,141 +232,138 @@ ul.footer_nav li.footer_copyright {
 	text-align: right;
 }
 
-.errors {
+.alert-danger {
 	color: red;
 }
 
-.errors:hover {
+.alert-danger:hover {
 	cursor: not-allowed;
 }
 
-.fatals {
-	color: red;
-	font-weight: bold;
+.alert-warning {
+	color: orange;
 }
 
-.infos {
+.alert-info {
 	color: cornflowerblue;
 }
 
-.warnings {
-	color: gold;
-}
-
-.message_box, .message_box_mini {
-	border: 1px solid #888888;
+.message-container {
+	border: 1px solid grey;
 	border-top-right-radius: 8px;
 	border-bottom-left-radius: 8px;
-	background-color: #f0f0fa;
+	background-color: ghostwhite;
 }
 
-.message_box {
+.message-medium {
 	width: 400px;
 }
 
-.message_box_mini {
+.message-auto {
+	margin: auto 0px;
+}
+
+.message-mini {
 	width: 160px;
 }
 
-.message_header {
-	border-bottom: 1px solid #888888;
+.message-header {
+	border-bottom: 1px solid grey;
 	background-image: linear-gradient(#eeeeee, #aaaaaa);
 	border-top-right-radius: 8px;
+	line-height: 18px;
+	text-align: center;
+	font-weight: bold;
 }
 
-.okay {
-	color: #00aa00;
-}
-
-.user_status_confirmed, .customer_status_confirmed {
+.user-status-confirmed, .customer-status-confirmed {
 	color: #00aa00;
 }
 
-.user_status_unconfirmed, .customer_status_unconfirmed {
+.user-status-unconfirmed, .customer-status-unconfirmed {
 	color: #00aaaa;
 }
 
-.user_status_locked, .customer_status_locked {
+.user-status-locked, .customer-status-locked {
 	color: #aa0000;
 }
 
-.unlink_link {
+.link-warning {
 	color: #aaaa00;
 }
 
-.delete_link {
+.link-danger {
 	color: #aa0000;
 }
 
-.right_space {
+.divider-right {
 	margin-right: 2px;
 }
 
-#content_header, .input, .select, .submit, .reset, .delete_button, .unlink_button, .fieldset {
-	border: 1px solid #888888;
+#content-header, .input, .select, .submit, .reset, .button-danger, .button-warning, .fieldset {
+	border: 1px solid grey;
 	border-top-right-radius: 8px;
 	border-bottom-left-radius: 8px;
 }
 
 .checkbox {
-	border: 1px solid #888888;
+	border: 1px solid grey;
 }
 
 input, textarea, select, option {
 	background-color: #fbfbfb;
 }
 
-.submit, .reset, .delete_button, .unlink_button {
+.submit, .reset, .button-danger, .button-warning {
 	cursor: pointer;
 }
 
-input:hover, textarea:hover, select:hover, option:hover {
-	border-color: #666666;
-	background-color: #eeeeee;
+.fieldset {
+	padding: 5px;
 }
 
-.delete_button:hover {
-	border-color: #dd0000;
-	background-color: #aa0000;
-	color: #eeeeee;
+.input {
+	padding-left: 4px;
+	padding-right: 4px;
 }
 
-.unlink_button:hover {
-	border-color: #dddd00;
-	background-color: #cccc00;
-	color: #eeeeee;
+#menu-content-wrapper {
+	overflow: auto;
 }
 
-.delete_button {
+.button-danger {
 	border-color: #ee0000;
 	background-color: #880000;
-	color: #ffffff;
+	color: white;
 }
 
-.unlink_button {
+.button-warning {
 	border-color: #eeee00;
 	background-color: #aaaa00;
-	color: #ffffff;
+	color: white;
 }
 
-.fieldset {
-	padding: 5px;
+input:hover, textarea:hover, select:hover, option:hover {
+	border-color: #666666;
+	background-color: #eeeeee;
 }
 
-.input {
-	padding-left: 4px;
-	padding-right: 4px;
+.button-danger:hover {
+	border-color: #dd0000;
+	background-color: #aa0000;
+	color: #eeeeee;
 }
 
-#menu_content {
-	overflow: auto;
+.button-warning:hover {
+	border-color: #dddd00;
+	background-color: #cccc00;
+	color: #eeeeee;
 }
-
-#menu_content::after {
+#menu-content-wrapper::after {
 	clear: both;
 }
 
-.table_row::after {
+.table-row::after {
 	clear: both;
 }
 
diff --git a/web/user/login_contact_data_saved.xhtml b/web/user/login_contact_data_saved.xhtml
index f02abb66..e2a2cbca 100644
--- a/web/user/login_contact_data_saved.xhtml
+++ b/web/user/login_contact_data_saved.xhtml
@@ -17,7 +17,7 @@
 	<ui:define name="content">
 		<widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('edit_user_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('edit_user_data')}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
 			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
diff --git a/web/user/login_edit_user_data.xhtml b/web/user/login_edit_user_data.xhtml
index 481cca5a..44336717 100644
--- a/web/user/login_edit_user_data.xhtml
+++ b/web/user/login_edit_user_data.xhtml
@@ -15,7 +15,7 @@
 
 	<ui:define name="content">
 		<h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-			<div class="table_header">
+			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_EDIT_USER_DATA_TITLE}" />
 			</div>
 
diff --git a/web/user/login_logout.xhtml b/web/user/login_logout.xhtml
index f8620d57..c80d0acc 100644
--- a/web/user/login_logout.xhtml
+++ b/web/user/login_logout.xhtml
@@ -16,7 +16,7 @@
 	<ui:define name="content">
 		<h:form id="form_user_logout" rendered="#{userLoginController.isUserLoggedIn()}">
 			<h:panelGroup styleClass="table" layout="block">
-				<div class="table_header">
+				<div class="table-header">
 					<h:outputText value="#{msg.LOGIN_USER_LOGOUT_TITLE}" />
 				</div>
 
@@ -24,7 +24,7 @@
 					<h:outputText value="#{msg.LOGIN_USER_LOGOUT_NOTICE}" />
 				</h:panelGroup>
 
-				<div class="table_footer">
+				<div class="table-footer">
 					<h:commandButton styleClass="submit" type="submit" action="#{userLoginController.doUserLogout()}" value="#{msg.BUTTON_USER_LOGOUT}" />
 				</div>
 			</h:panelGroup>
diff --git a/web/user/login_user_change_email_address.xhtml b/web/user/login_user_change_email_address.xhtml
index fedd9d48..77e5d7dd 100644
--- a/web/user/login_user_change_email_address.xhtml
+++ b/web/user/login_user_change_email_address.xhtml
@@ -15,10 +15,10 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_CHANGE_EMAIL_ADDRESS_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('user_change_email_address')}" />
 
 		<h:panelGroup styleClass="table" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('user_change_email_address')}">
-			<div class="table_header">
+			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_ADDRESS_TITLE}" />
 			</div>
 
@@ -28,12 +28,12 @@
 						<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_LEGEND}" />
 					</legend>
 
-					<h:panelGroup styleClass="table_row" layout="block">
-						<div class="table_left">
+					<h:panelGroup styleClass="table-row" layout="block">
+						<div class="table-left">
 							<h:outputText value="#{msg.LOGIN_CHANGE_EMAIL_OLD_ADDRESS}" />
 						</div>
 
-						<div class="table_right">
+						<div class="table-right">
 							<h:outputText value="#{contactController.emailAddress}" />
 						</div>
 					</h:panelGroup>
@@ -45,8 +45,8 @@
 
 				<ui:include src="/WEB-INF/templates/login/login_enter_current_password.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton class="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton class="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton class="submit" type="submit" id="change_email" value="#{msg.BUTTON_CHANGE_EMAIL_ADDRESS}" action="#{userEmailChangeController.doUserChangeEmailAddress()}" />
 				</div>
 			</h:form>
diff --git a/web/user/login_user_change_password.xhtml b/web/user/login_user_change_password.xhtml
index 9d641961..829bb87e 100644
--- a/web/user/login_user_change_password.xhtml
+++ b/web/user/login_user_change_password.xhtml
@@ -20,7 +20,7 @@
 		<ui:fragment rendered="#{userLoginController.isUserLoggedIn()}">
 			<h:form id="form_user_change_password">
 				<h:panelGroup styleClass="table" layout="block" rendered="#{featureController.isFeatureEnabled('change_user_password')}">
-					<div class="table_header">
+					<div class="table-header">
 						<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_TITLE}" />
 					</div>
 
@@ -29,32 +29,32 @@
 							<h:outputText value="#{msg.LOGIN_CHANGE_PASSWORD_LEGEND}" />
 						</legend>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left">
 								<h:outputLabel for="userPassword" value="#{msg.USER_ENTER_NEW_PASSWORD}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table-right">
 								<h:inputSecret styleClass="input" id="userPassword" size="10" maxlength="255" value="#{userPasswordController.userPassword}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REQUIRED}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPassword" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPassword" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 
-						<h:panelGroup styleClass="table_row" layout="block">
-							<div class="table_left">
+						<h:panelGroup styleClass="table-row" layout="block">
+							<div class="table-left">
 								<h:outputLabel for="userPasswordRepeat" value="#{msg.USER_ENTER_NEW_PASSWORD_REPEAT}" />
 							</div>
 
-							<div class="table_right">
+							<div class="table-right">
 								<h:inputSecret styleClass="input" id="userPasswordRepeat" size="10" maxlength="255" value="#{userPasswordController.userPasswordRepeat}" required="true" requiredMessage="#{msg.USER_NEW_PASSWORD_REPEAT_REQUIRED}" />
 							</div>
 						</h:panelGroup>
 
 						<h:panelGroup styleClass="error_container" layout="block">
-							<h:message for="userPasswordRepeat" errorClass="errors" fatalClass="errors" warnClass="errors" />
+							<h:message for="userPasswordRepeat" errorClass="alert-danger" fatalClass="alert-danger" warnClass="alert-warning" />
 						</h:panelGroup>
 					</fieldset>
 
@@ -63,15 +63,15 @@
 
 					<ui:include src="/WEB-INF/templates/login/user/user_enter_current_password.tpl" />
 
-					<div class="table_footer">
-						<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+					<div class="table-footer">
+						<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 						<h:commandButton styleClass="submit" type="submit" id="change_password" value="#{msg.BUTTON_USER_CHANGE_PASSWORD}" action="#{userPasswordController.doChangePassword()}" />
 					</div>
 				</h:panelGroup>
 			</h:form>
 		</ui:fragment>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_password')}" />
 
 		<ui:fragment rendered="#{not userLoginController.isUserLoggedIn()}">
 			<ui:include src="/WEB-INF/templates/user/user_not_logged_in.tpl" />
diff --git a/web/user/login_user_change_personal_data.xhtml b/web/user/login_user_change_personal_data.xhtml
index 90150c04..f77c383e 100644
--- a/web/user/login_user_change_personal_data.xhtml
+++ b/web/user/login_user_change_personal_data.xhtml
@@ -15,8 +15,8 @@
 	</ui:define>
 
 	<ui:define name="content">
-		<h:panelGroup styleClass="table_medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
-			<div class="table_header">
+		<h:panelGroup styleClass="table table-medium" layout="block" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}">
+			<div class="table-header">
 				<h:outputText value="#{msg.LOGIN_CHANGE_PERSONAL_DATA_TITLE}" />
 			</div>
 
@@ -27,14 +27,14 @@
 
 				<ui:include src="/WEB-INF/templates/guest/guest_privacy_terms.tpl" />
 
-				<div class="table_footer">
-					<h:commandButton styleClass="reset right_space" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+				<div class="table-footer">
+					<h:commandButton styleClass="reset divider-right" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
 					<h:commandButton styleClass="submit" type="submit" id="change_personal_data" value="#{msg.BUTTON_CHANGE_PERSONAL_DATA}" action="#{userController.doChangePersonalData()}" />
 				</div>
 			</h:form>
 		</h:panelGroup>
 
-		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
 			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />
diff --git a/web/user/login_user_contact_data_saved.xhtml b/web/user/login_user_contact_data_saved.xhtml
index 713b4b0f..04707419 100644
--- a/web/user/login_user_contact_data_saved.xhtml
+++ b/web/user/login_user_contact_data_saved.xhtml
@@ -17,7 +17,7 @@
 	<ui:define name="content">
 		<widgets:outputMessageBox message="#{msg.LOGIN_MESSAGE_DATA_SAVED}" rendered="#{userLoginController.isUserLoggedIn() and featureController.isFeatureEnabled('change_user_personal_data') and (not userLoginController.ifUserMustChangePassword() or not featureController.isFeatureEnabled('user_must_change_password'))}" />
 
-		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" styleClass="errors" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
+		<widgets:outputMessageBox message="#{msg.ERROR_LOGIN_USER_EDIT_DATA_DISABLED}" messageStyleClass="alert-danger" rendered="#{not featureController.isFeatureEnabled('change_user_personal_data')}" />
 
 		<ui:fragment rendered="#{userLoginController.ifUserMustChangePassword()}">
 			<h:link outcome="user_change_password" value="#{msg.USER_LOGIN_MUST_CHANGE_PASSWORD}" />