Trying to fix I18n bug and a few styles :)