Made changes for the layout & I18N.