Some corrections
Refactor codes and templates: each section a separated app