Design bugs fixed.
Locale variables changed.
Merge branch 'feature/design_bug_43' into develop