18n support
style fix