Enhanced System configuration, fixed some bugs and working on i18n