Refactor base.html and app.html
Merge pull request #418 from javierluraschi/RefactorBaseApp

Refactor base.html and app.html