Fixes and additions

Takes into account commit b9b95d53ad9d46f5f81f8478d20c47d461f7ad31 and
adds localization to View Cell