Added module to data views plus more logging
Merge 'includes' and 'reload fix
Refine logging