Added extra check in the view renderer
Moved some code around
Updated the way the configuration files are loaded