[WIP] More refacoring, arabization and documented controller action