Address some comments. CSS cleanup and i18n left.