Fixed HAML errors and some new i18n strings