Some tweaks + Folder for generated reports