Converted most of the views from ejs templates to jade templates
Merged conflicts