diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 000000000..fe461b424
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Request, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+  contents: read
+
+jobs:
+  dependency-review:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 'Checkout Repository'
+        uses: actions/checkout@v3
+      - name: 'Dependency Review'
+        uses: actions/dependency-review-action@v2
diff --git a/application/config/form_validation.php b/application/config/form_validation.php
new file mode 100644
index 000000000..1adbb27e3
--- /dev/null
+++ b/application/config/form_validation.php
@@ -0,0 +1,11 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------------
+| Configurations parameters to Form Validations
+| -------------------------------------------------------------------------
+|
+*/
+
+// Format Error Messages using Bootstrap
+$config['error_prefix'] = '<div class="alert alert-warning" role="alert">';
+$config['error_suffix'] = '</div>';
diff --git a/application/controllers/admin/Catalog.php b/application/controllers/admin/Catalog.php
index fad23ffdc..f86f50548 100644
--- a/application/controllers/admin/Catalog.php
+++ b/application/controllers/admin/Catalog.php
@@ -64,9 +64,14 @@ public function __construct()
 	 */
 	function index()
 	{
+		// @TODO: Confirm Cleaning of Erros and Messages from previous Forms
+		$this->session->unset_userdata('error');
+		$this->session->unset_userdata('message');
+
 		$this->template->set_template('admin5');
 		//css files
 		$inline_styles=$this->load->view('catalog/catalog_style',NULL, TRUE);
+
 		$this->template->add_css($inline_styles,'embed');
 
 		//js files
@@ -299,30 +304,83 @@ private function get_temp_upload_folder()
 
 
 	function upload()
-	{
-		$this->add_study();
-	}
-
-	/**
-	 * Upload form for DDI (xml) file
-	 *
-	 * @return void
-	 **/
-	function add_study()
 	{
 		//user has permissions on the repo
 		//$this->acl->user_has_repository_access($this->active_repo->id);
 		$this->acl_manager->has_access_or_die('study', 'create',null,$this->active_repo->repositoryid);
 
-		$this->template->set_template('admin');
+		// @TODO: File Validation Rules
+		// Files XML or RDF should be allowed in one field, they are exclusive
+		$this->form_validation->set_rules('userfile',t('msg_select_ddi'),'callback_upload_file_check');
+		// RRE - One call back check both
+		//$this->form_validation->set_rules('rdf-file',t('msg_select_ddi'),'callback_upload_file_check');
+
+//		$this->form_validation->set_rules('userfile',t('msg_select_ddi'),'uploaded[userfile]|ext_in[userfile.xml]]');
+//		$this->form_validation->set_rules('rdf-file',t('msg_select_ddi'),'uploaded[rdf-file]|mime_in[rdf-file.xml]|ext_in[rdf-file.xml]');
+
+		if ($this->form_validation->run() == FALSE) {
 
-		//show upload form when no DDI is uploaded
-		if(!$this->input->post("submit")){
+			$this->template->set_template('admin');
 			$content=$this->load->view('catalog/ddi_upload_form', array('active_repo'=>$this->active_repo),true);
 			$this->template->write('content', $content,true);
 	  		$this->template->render();
 			return;
+		} else {
+
+			$new_survey=$this->add_study();
+
+			if (!empty($new_survey)){
+				// RRE Clear Errors
+				// @TODO: Review if messages should be unset too
+				$this->session->unset_userdata('error');
+				//redirect('admin/catalog/edit/'.$result['sid'],'refresh');
+				redirect('admin/catalog/edit/'.$new_survey,'refresh');
+				return;
+			}
+
 		}
+		return redirect('admin/catalog/upload');
+	}
+
+	/**
+	 * Upload Form Validation file
+	 *
+	 * @return TRUE | FALSE
+	 * RRE - Validation runs for xml and rdf files
+	 *   Rules: $_FILES Array()
+	 *	fields: xml - userfile,rdf -  rdf-file
+	 *	rdf files requires xml
+	 * matching file names
+	 **/
+	function upload_file_check()
+	{
+		if (empty($_FILES['userfile']['name'])) {
+			$this->form_validation->set_message('upload_file_check','{field} '.t('msg_select_ddi'));
+			return FALSE;
+		}
+
+		if (!empty($_FILES['rdf-file']['name'])) {
+			if (strtolower(basename($_FILES['rdf-file']['name'],'.rdf')) <> strtolower(basename($_FILES['userfile']['name'],'.xml'))) {
+				$this->form_validation->set_message('upload_file_check','{field} '.t('Files need to have the same Name'));
+				return FALSE;
+			}
+		}
+		return TRUE;
+	}
+
+	/**
+	 * Upload form for DDI (xml) file
+	 *
+	 * @return void
+	 * @return Survey ID | NULL
+	 * @TODO: Due a possible Duplicated Record Error or Parse Error
+	 * 	Message should be returned to the form
+	 **/
+	function add_study()
+	{
+		// @TODO: Move the Form one level up, add_study calls the model
+
+		//process form
 
 		$overwrite=$this->input->post("overwrite");
 		$repositoryid=$this->input->post("repositoryid");
@@ -334,8 +392,8 @@ function add_study()
 			$overwrite=FALSE;
 		}
 
-		//process form
-
+		// Uploads the xml File
+		// @TODO: review if the file should reamin in the directory after the process is executed
 		$temp_upload_folder=$this->get_temp_upload_folder();
 
 		//upload class configurations for DDI
@@ -346,8 +404,8 @@ function add_study()
 
 		$this->load->library('upload', $config);
 
-		//process uploaded ddi file
-		$ddi_upload_result=$this->upload->do_upload();
+		// @TODO: Review ONLY XML file is in this reference, RDF files ? or XML RDF pair?
+		$ddi_upload_result=$this->upload->do_upload('userfile');
 
 		$uploaded_ddi_path=NULL;
 
@@ -356,7 +414,8 @@ function add_study()
 			$error = $this->upload->display_errors();
 			$this->db_logger->write_log('ddi-upload',$error,'catalog');
 			$this->session->set_flashdata('error', $error);
-			redirect('admin/catalog/add_study','refresh');
+			return NULL;
+			//redirect('admin/catalog/add_study','refresh');
 		}
 		else //successful upload
 		{
@@ -380,7 +439,7 @@ function add_study()
 			'overwrite'=>$overwrite
 		);
 
-		try{
+		try {
 			//import ddi
 			$result=$this->ddi2_import->import($params);
 
@@ -389,22 +448,42 @@ function add_study()
 
 			$this->events->emit('db.after.update', 'surveys', $result['sid'],'refresh');
 			$this->session->set_flashdata('success', $result);
-			redirect('admin/catalog/edit/'.$result['sid'],'refresh');return;
+
+			//redirect('admin/catalog/edit/'.$result['sid'],'refresh');return;
+			return $result['sid'];
 		}
-		catch(ValidationException $e){
+		// @TODO: Find how to replicate this error
+		catch (ValidationException $e){
 			$error_output=array(
 				'status'=>'failed',
 				'message'=>$e->getMessage(),
 				'errors'=>$e->GetValidationErrors()
 			);
 
-			$error_str='Validation Error<br/><pre class="error-pre">'.print_r($e->GetValidationErrors(),true).'</pre>';			
+// RRE  @TODO: Multiple errors in the xml validation
+			// $error_str='Validation Error<br/><pre class="error-pre">'.print_r($e->GetValidationErrors(),true).'</pre>';
+			$arr_errors=$e->GetValidationErrors();
+			$error_str='Validation Error<br/><pre class="error-pre">';
+			foreach ($arr_errors as $key_error) {
+				$error_str.=$key_error['message'].'<br>';
+			}
+			$error_str.='</pre>';
 			$this->session->set_flashdata('error', $error_str);
-			redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/upload','refresh');
+
+			return NULL;
 		}
-		catch(Exception $e){
+		catch (Exception $e){
 			$this->session->set_flashdata('error', $e->getMessage());
-			redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/add_study','refresh');return;
+			//redirect('admin/catalog/upload','refresh');
+			return NULL;
+		}
+		finally {
+			// @TODO: Review if this is OK.
+			unlink($ddi_path);
+
 		}
 	}
 
@@ -422,7 +501,8 @@ private function upload_rdf_file($sid)
 		$this->upload->initialize($config);
 
 		//process uploaded rdf file
-		$rdf_upload_result=$this->upload->do_upload('rdf');
+		//$rdf_upload_result=$this->upload->do_upload('rdf');
+		$rdf_upload_result=$this->upload->do_upload('rdf-file');
 
 		$uploaded_rdf_path='';
 
@@ -480,9 +560,9 @@ private function __replace_ddi($sid,$new_ddi_file)
             'file_type'=>'survey',
             'file_path'=>$new_ddi_file
         );
-        
+
 		$this->load->library('Metadata_parser', $parser_params);
-		
+
 		 //parser to read metadata
 		 $parser=$this->metadata_parser->get_reader();
 
@@ -492,7 +572,7 @@ private function __replace_ddi($sid,$new_ddi_file)
 		 if ($new_idno!==$this->sanitize_filename($new_idno)){
 			 throw new Exception(t('IDNO_INVALID_FORMAT').': '.$new_idno);
 		 }
- 
+
 		 //check if the study already exists, find the sid		
 		$new_ddi_sid=$this->dataset_manager->find_by_idno($new_idno);
 
@@ -637,14 +717,14 @@ function refresh($id=NULL)
 		}
 	}
 
-	
+
 
 	/**
 	*
 	* Clear files from the imports folder
 	**/
 	function clear_import_folder()
-	{		
+	{
 		$this->load->helper('file');
 		$import_folder=$this->config->item('ddi_import_folder');
 
@@ -679,17 +759,16 @@ function process_batch_uploads()
 	{
 		//import folder path
 		$import_folder=$this->config->item('ddi_import_folder');
-
 		if (!file_exists($import_folder)){
 			show_error('FOLDER-NOT-SET');
 		}
 
 		$config = array(
-				'max_tmp_file_age' 		=> 900,
-				'max_execution_time' 	=> 300,
-				'target_dir' 			=> $import_folder,
+				'max_tmp_file_age'	=> 900,
+				'max_execution_time'	=> 300,
+				'target_dir' 		=> $import_folder,
 				'allowed_extensions'	=>'xml|rdf',
-				'overwrite_file'		=>TRUE
+				'overwrite_file'	=>TRUE
 				);
 
 		$this->load->library('Chunked_uploader', $config, 'uploader');
@@ -719,7 +798,6 @@ function process_batch_uploads()
 	}
 
 
-
 	/**
 	 * Imports multiple ddi files from the server folder
 	 *
@@ -738,20 +816,27 @@ function batch_import()
 		$import_folder=$this->config->item('ddi_import_folder');
 
 		if (!file_exists($import_folder) ){
-			$import_folder="/datasets";
+			// @TODO: Review datasets directory does not exist either
+			// @TODO: Review if this default should set config->item('ddi_import_folder')
+			//	The next calls to config->item('ddi_import_folder') will fail if this is not set.
+			// $import_folder="/datasets";
+			$import_folder="/datafiles/tmp";
 		}
 
 		//read files
 		$files['files']=get_dir_file_info($import_folder);
 
 		if ( $files['files']){
-			foreach($files['files'] as $key=>$value){				
-				if (substr($value['name'],-4)!='.xml'){
+			foreach($files['files'] as $key=>$value){
+				//if (substr($value['name'],-4)!='.xml'){
+				//if (! in_array(pathinfo($value['name'], PATHINFO_EXTENSION), array('xml','rdf'))) {
+				if (! in_array(pathinfo($value['name'], PATHINFO_EXTENSION), array('xml'))) {
+					// @TODO: Check if rdf files should be processed
 					unset($files['files'][$key]);
 				}
 			}
 		}
-		
+
 		$options=array(
 			'repositories'=>$this->Repository_model->select_all(),
 			'files'=>$files['files'],
@@ -791,10 +876,10 @@ function do_batch_import()
 			echo json_encode(array('error'=>t('REPO_ACCESS_DENIED')) );
 			exit;
 		}
-		
+
 		$this->load->model("Data_file_model");
 		$this->load->library('DDI2_import');
-		
+
 		$user=$this->ion_auth->current_user();
 
 		$ddi_path=$ddi_file;
@@ -826,7 +911,7 @@ function do_batch_import()
 				'message'=>$e->getMessage(),
 				'errors'=>$e->GetValidationErrors()
 			);
-			
+
 			$error=print_r($e->GetValidationErrors(),true);
 			echo json_encode(array('error'=>$error) );
 			die();
@@ -838,7 +923,7 @@ function do_batch_import()
 		}
 	}
 
-	
+
 
 	/**
 	*
diff --git a/application/libraries/Chunked_uploader.php b/application/libraries/Chunked_uploader.php
index 2bf4e6a38..a5d658bd1 100644
--- a/application/libraries/Chunked_uploader.php
+++ b/application/libraries/Chunked_uploader.php
@@ -329,7 +329,7 @@ class Chunked_upload_request {
 	private $_file_type; // mime-type of file
 
 	/**
-	 * Initialises new object with values from the $_REQUEST and 
+	 * Initialises new object with values from the $_REQUEST and
 	 * $_SERVER arrays
 	 */
 
@@ -344,12 +344,18 @@ public function __construct()
 		$this->_file_type = isset($_SERVER['HTTP_X_FILE_TYPE'])
 				? $_SERVER['HTTP_X_FILE_TYPE']
 				: '';
+
+		// @TODO: Fatal error: Unparenthesized 'a ? b : c ? d : e' is not supported. 
+		//	Use either '(a ? b : c) ? d : e' or 'a ? b : (c ? d : e)
 		// attempt to get file name from $_REQUEST, otherwise look for X_FILE_NAME header
 		$name = isset($_REQUEST["name"])
 				? $_REQUEST["name"]
-				: (isset($_SERVER['HTTP_X_FILE_NAME'])
+				: (
+					(isset($_SERVER['HTTP_X_FILE_NAME'])
 						? $_SERVER['HTTP_X_FILE_NAME']
-						: 'file');
+						: 'file')
+				  );
+
 		// clean the filename for security
 		$this->_name = preg_replace('/[^\w\._]+/', '_', $name);
 		// attempt to get the content-type from $_SERVER array
@@ -362,7 +368,7 @@ public function __construct()
 
 	/**
 	 * Returns the original filename (from client machine)
-	 * @return string file name 
+	 * @return string file name
 	 */
 	public function get_name()
 	{
@@ -426,4 +432,4 @@ public function is_multipart()
 }
 
 /* End of file Chunked_uploader.php */
-/* Location: /sparks/chunked_uploader/0.0.1/libraries/Chunked_uploader.php */
\ No newline at end of file
+/* Location: /sparks/chunked_uploader/0.0.1/libraries/Chunked_uploader.php */
diff --git a/application/views/catalog/batch_file_upload.php b/application/views/catalog/batch_file_upload.php
index fe37534f5..24b9bbb49 100644
--- a/application/views/catalog/batch_file_upload.php
+++ b/application/views/catalog/batch_file_upload.php
@@ -6,8 +6,7 @@
 // Convert divs to queue widgets when the DOM is ready
 $(function() {
 
-	function log()
-	{
+	function log() {
 	}
 
 	$("#uploader").pluploadQueue({
@@ -21,9 +20,11 @@ function log()
 		multipart_params: { 'upload_folder': 'default', 'overwrite':0},
 
 		// Specify what files to browse for
-		filters : [
+		filters : {
+			mime_types: [
 			{title : "External Resources", extensions : "<?php echo $allowed_extensions;?>"}
-		],
+			]
+		},
 
 		// Flash settings
 		flash_swf_url : 'javascript/plupload/js/Moxie.swf',
@@ -79,12 +80,12 @@ function log()
 
 			FileUploaded: function(up, file, info) {
 				// Called when a file has finished uploading
-				//console.log('[FileUploaded] File:', file, "Info:", info);
+				console.log('[FileUploaded] File:', file, "Info:", info);
 			},
 
 			ChunkUploaded: function(up, file, info) {
 				// Called when a file chunk has finished uploading
-				//log('[ChunkUploaded] File:', file, "Info:", info);
+				log('[ChunkUploaded] File:', file, "Info:", info);
 			},
 
 			UploadComplete: function (up, file) {
diff --git a/application/views/catalog/ddi_batch_import.php b/application/views/catalog/ddi_batch_import.php
index 442b09f51..1b830d015 100644
--- a/application/views/catalog/ddi_batch_import.php
+++ b/application/views/catalog/ddi_batch_import.php
@@ -15,49 +15,68 @@
 }
 ?>
 
-<?php 
+<?php
 //batch uploader using PLUPLOAD
 $batch_upload_options=array(
 	'allowed_extensions'	=>'xml,rdf',
-	'destination_url'		=>'admin/catalog/batch_import',
-	'upload_url'			=>'admin/catalog/process_batch_uploads'
+	'destination_url'	=>'admin/catalog/batch_import',
+	'upload_url'		=>'admin/catalog/process_batch_uploads'
 );
 $batch_uploader=$this->load->view('catalog/batch_file_upload',$batch_upload_options,TRUE);
 ?>
 
 <div class="container-fluid">
 
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="alert alert-danger">'.$error.'</div>' : '';?>
+<?php $error=$this->session->flashdata('error'); ?>
+<?php if ($error!=""):?>
+        <div class="alert alert-danger alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $error;?>
+        </div>
+<?php endif;?>
+
+<?php $message=$this->session->flashdata('message');?>
+<?php if ($message!=""):?>
+        <div class="alert alert-success alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $message;?>
+        </div>
+<?php endif;?>
 
 <h1 class="page-title"><?php echo t('batch_import_title');?> <span class="label label-default"><?php echo $repositories_list[$active_repository];?></span></h1>
 <div>
 
 <?php if ( count($files)==0 || $files===false) :?>
-    <div class="alert alert-block">
-		<?php echo sprintf(t('import_ddi_no_files_found'),$this->config->item('ddi_import_folder'));?>
+    <div class="alert alert-warning alert-dismissible">
+	<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+		<span aria-hidden="true">×</span>
+	</button>
+	<?php echo sprintf(t('import_ddi_no_files_found'),$this->config->item('ddi_import_folder'));?>
     </div>
-    
     <?php echo $batch_uploader;?>
     <?php return; ?>
 <?php endif; ?>
 
 <div>
 	<?php echo sprintf(t('import_ddi_files_found'),count($files));?> <input class="btn btn-primary" type="button" name="import" value="<?php echo t('btn_import');?>" onclick="batch_import.process();"/>
-    
+
     <div>
-    
+
     <div class="form-group">
         <label for="overwrite" class="desc" >
         	<input type="checkbox" name="overwrite" id="overwrite" checked="checked"  value="yes"/> <?php echo t('ddi_overwrite_exist');?> 
         </label>
-    </div>  
-    
+    </div>
+
     </div>
 </div>
 
 <div class="note" id="batch-import-box" style="display:none;" >
-    <div id="batch-import-processing" style="padding:5px;border-bottom:1px solid gainsboro;margin-bottom:10px;">Processing survey...</div>
+<!--    <div id="batch-import-processing" style="padding:5px;border-bottom:1px solid gainsboro;margin-bottom:10px;">Processing survey...</div>
+-->
+    <div id="batch-import-processing" class="alert alert-info alert-dismissible">Processing survey...</div>
     <div id="batch-import-log" ></div>
 </div>
 
@@ -66,13 +85,13 @@
 <input type="hidden" name="repositoryid" id="repositoryid" value="<?php echo $active_repository;?>"/>
 
 <div class="batch-links">
-<a class="batch-uploader" href="#" onclick="javascript:return false;"><?php echo t('batch_upload_files');?></a> | 
+<a class="batch-uploader" href="#" onclick="javascript:return false;"><?php echo t('batch_upload_files');?></a> |
 <a href="<?php echo site_url('admin/catalog/clear_import_folder');?>"><?php echo t('clear_import_folder');?></a>
 </div>
 
 <div class="uploader-body state-hidden"><?php echo $batch_uploader;?></div>
 
-<table class="table table-striped" width="100%" cellspacing="0" cellpadding="0"> 
+<table class="table table-striped" width="100%" cellspacing="0" cellpadding="0">
 <tr align="left" class="header">
 	<th><input type="checkbox" value="-1" id="chk_toggle"/></th>
     <th><?php echo t('name');?></th>
@@ -93,7 +112,7 @@
 
 </div>
 <script language="javascript">
-//translations	
+//translations
 var i18n=
 {
 'cancel_import_process':"<?php echo t('cancel_import_process');?>",
@@ -103,108 +122,119 @@
 
 $(".log").css({ border: '1px solid gray'});
 var batch_import = {
-	
+
 	id:null,
 	queue:[],
 	queue_idx:0,
 	xhr:null,
 	isprocessing:false,
-	
+
 	process : function() {
-		
+
 		if (this.isprocessing==true){
 			return false;
 		}
-		
+
 		this.queue_idx=0;
 		this.queue=[];
 		obj=this;
 		var i=0;
 
-		$('.chk').each(function(){ 
+		$('.chk').each(function(){
 		   if (this.checked==true) {
 				obj.queue[i++]={id:this.id,name:this.value};
 		   }
-	    }); 
+	    });
 
 		html=$("#batch-import-box").html();
 		$("#batch-import-log").html("");
 		this.process_queue();
 	},
-	
+
 	//process items in queue
 	process_queue: function(){
-		if (this.queue_idx<this.queue.length) {			
-			
+		if (this.queue_idx<this.queue.length) {
+
 			html='<i class="fa fa-spinner fa-pulse fa-2x fa-fw"></i> Importing '+ (this.queue_idx+1) +' of '+this.queue.length+'... <b>['+this.queue[this.queue_idx].name+']</b>';
 			html+=' <a href="#" onclick="batch_import.abort();return false;">' +i18n.cancel_import_process+'</a>';
 			$("#batch-import-box").show();
 			$("#batch-import-processing").html(html);
-			
+
 			this.isprocessing=true;
-			this.import_single(this.queue[this.queue_idx++].id);		
+			this.import_single(this.queue[this.queue_idx++].id);
 		}
 		else{
-			$("#batch-import-processing").html(i18n.import_completed);
+			html='<button type="button" class="close" data-dismiss="alert" aria-label="Close">';
+			html+='<span aria-hidden="true">×</span></button>';
+			html+=i18n.import_completed;
+			$("#batch-import-processing").html(html);
 			this.isprocessing=false;
 		}
-		
+
 	},
-	
+
 	import_single: function(id) {
 		obj=this;
 		//set error hanlder
 		$.ajaxSetup({
-				error:function(x,e){	
+				error:function(x,e){
 					alert("Error code: " + x.status + " " + x.responseText);
 					obj.abort();
 				}
-			});		
-		
+			});
+
 		var overwrite=0;
 		var repositoryid=null;
 		if ($("#overwrite").is(":checked")){overwrite=1}
 		repositoryid=$("#repositoryid").val();
-		//post	
+		//post
 		this.xhr=$.post(CI.base_url+"/admin/catalog/do_batch_import",{id:id,overwrite:overwrite,repositoryid:repositoryid},func_data, "json");
-		
+
 		//handle json returned values
 		function func_data(data){
 			 if (data.success){
 				obj.queue[obj.queue_idx-1].status=data.success;
-				$("#batch-import-log").append('<div class="log" style="color:green;">#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
+				// $("#batch-import-log").append('<div class="log" style="color:green;">#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
+				$("#batch-import-log").append('<div class="alert alert-success alert-dismissible">' +
+					'<button type="button" class="close" data-dismiss="alert" aria-label="Close">' +
+					'<span aria-hidden="true">×</span></button>' +
+					'#' + (obj.queue_idx) + ': '  + obj.queue[obj.queue_idx-1].name + ' - ' + data.success+ '</div>');
 			 }
 			 else{
 			 	obj.queue[obj.queue_idx-1].status=data.error;
-				$("#batch-import-log").append('<div class="log" style="color:red">#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
+				//$("#batch-import-log").append('<div class="log" style="color:red">#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
+				$("#batch-import-log").append('<div class="alert alert-danger alert-dismissible">' +
+					'<button type="button" class="close" data-dismiss="alert" aria-label="Close">' +
+					'<span aria-hidden="true">×</span></button>' +
+					'#' + (obj.queue_idx) + ': '  +  obj.queue[obj.queue_idx-1].name + ' - ' + data.error+ '</div>');
 			 }
 			 obj.process_queue();
 		}//end-func
 	},
-	
+
 	abort: function(){
 		$("#batch-import-processing").html(i18n.import_cancelled);
 		this.xhr.abort();
 		this.isprocessing=false;
-	}	
+	}
 };
 
 
 //checkbox select/deselect
 jQuery(document).ready(function(){
 	$("#chk_toggle").click(
-			function (e) 
+			function (e)
 			{
-				$('.chk').each(function(){ 
-                    this.checked = (e.target).checked; 
-                }); 
+				$('.chk').each(function(){
+                    this.checked = (e.target).checked;
+                });
 			}
 	);
-	
+
 	$(".batch-uploader").click(function(e){
 		$(".uploader-body").toggleClass("state-hidden");
 	});
-	
+
 });
 
 </script>
diff --git a/application/views/catalog/ddi_upload_form.php b/application/views/catalog/ddi_upload_form.php
index a4c8bc0e2..a71d2c386 100644
--- a/application/views/catalog/ddi_upload_form.php
+++ b/application/views/catalog/ddi_upload_form.php
@@ -24,39 +24,52 @@
 <div class="container-fluid content-container ddi-upload">
 <?php //include 'catalog_page_links.php'; ?>
 
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="error">'.$error.'</div>' : '';?>
+<?php $error=$this->session->flashdata('error'); ?>
+<?php if ($error!=""):?>
+        <div class="alert alert-danger alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $error;?>
+        </div>
+<?php endif;?>
 
 <?php $message=$this->session->flashdata('message');?>
-<?php echo ($message!="") ? '<div class="success">'.$message.'</div>' : '';?>
+<?php if ($message!=""):?>
+        <div class="alert alert-success alert-dismissible">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                </button><?php echo $message;?>
+        </div>
+<?php endif;?>
 
+<?php echo validation_errors(); ?>
 
 <div class="col-md-6">
 
-  <h1 class="page-title"><?php echo t('add_study_to_collection');?> 
-      <!--<span class="active-repo"><?php echo $repositories_list[$active_repository];?></span>-->
+  <h1 class="page-title"><?php echo t('add_study_to_collection');?>
+      <!--<span class="active-repo"><?php // echo $repositories_list[$active_repository];?></span>-->
   </h1>
 
-	<?php echo form_open_multipart("", array('class'=>'form')	 );?>
-    <input type="hidden" name="repositoryid" value="<?php echo $active_repository;?>"/>
+   <?php echo form_open_multipart("", array('class'=>'form')	 );?>
 
-  <div class="form-group">
-    <label for="userfile"><?php echo t('msg_select_ddi');?></label>
-    <input  class="form-control-file"  type="file" name="userfile" id="userfile" size="60"/>
-    <small id="ddi-help" class="form-text text-muted"><span class="max-file-size">(<?php echo t('max_upload_limit') ." ".$max_limit;?>MB)</span></small>
-  </div>
+   <input type="hidden" name="repositoryid" value="<?php echo $active_repository;?>"/>
 
+      <div class="form-group">
+         <label for="userfile"><?php echo t('msg_select_ddi');?></label>
+         <input  class="form-control-file"  type="file" name="userfile" id="userfile" size="60"/>
+         <small id="ddi-help" class="form-text text-muted"><span class="max-file-size">(<?php echo t('max_upload_limit') ." ".$max_limit;?>MB)</span></small>
+      </div>
 
-  <div class="form-group">
-    <label for="userfile"><?php echo t('msg_select_rdf');?></label>
-    <input class="form-control-file" type="file" name="rdf" id="rdf-file" size="60"/>    
-  </div>
+      <div class="form-group">
+         <label for="rdf-file"><?php echo t('msg_select_rdf');?></label>
+         <input class="form-control-file" type="file" name="rdf-file" id="rdf-file" size="60"/>
+         <small id="ddi-help" class="form-text text-muted"><span class="max-file-size">(<?php echo t('max_upload_limit') ." ".$max_limit;?>MB)</span></small>
+      </div>
 
-  <div class="form-group" style="margin-top:10px;">
-  <label for="overwrite" class="desc">
-      <input type="checkbox" name="overwrite" id="overwrite" value="yes"/> <?php echo t('ddi_overwrite_exist');?>
-  </label>
-  </div>
+      <div class="form-group" style="margin-top:10px;">
+         <input type="checkbox" name="overwrite" id="overwrite" value="yes" <?php echo set_checkbox('overwrite','yes'); ?>" />
+         <label for="overwrite" class="desc"><?php echo t('ddi_overwrite_exist');?></label>
+      </div>
 
 	<?php echo form_submit('submit',t('submit'), 'class="btn btn-primary"'); ?>
     <?php echo anchor('admin/catalog',t('cancel'));?>
@@ -66,9 +79,9 @@
 
 <div class="col-md-6" style="background:#eeeeee; padding:20px;">
   <h2 style="margin:0px;margin-bottom:15px;"><?php echo t('Create new study');?> </h2>
-  
 
-  <form class="form"  method="get" action="<?php echo site_url('admin/catalog/create');?>">    
+
+  <form class="form"  method="get" action="<?php echo site_url('admin/catalog/create');?>">
 
     <div class="form-group">
       <label for="exampleInputEmail1">Select data type</label>
@@ -80,7 +93,7 @@
         <option value="timeseries">Timeseries</option>
         <option value="script">Script</option>
         <option value="image">Image</option>
-      </select>  
+      </select>
     </div>
 
     <button type="submit" class="btn btn-primary">Create</button>
@@ -88,4 +101,4 @@
 
 </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/application/views/catalog/edit_study.php b/application/views/catalog/edit_study.php
index 6ae35a347..d144d6bb1 100644
--- a/application/views/catalog/edit_study.php
+++ b/application/views/catalog/edit_study.php
@@ -52,8 +52,8 @@ function toggle(element){
 		//study publish/unpublish
 		$(document.body).on("click","#survey .publish, .survey-publish .publish", function(){
 			var studyid=$(this).attr("data-sid");
-			if ($(this).attr("data-value")==0){				
-				$this=this;				
+			if ($(this).attr("data-value")==0){
+				$this=this;
 				$.post(CI.base_url+'/admin/catalog/publish/'+studyid+'/1?ajax=1', {submit:"submit"}, function( data ) {
 					$($this).attr("data-value",1);
 					$($this).html("<?php echo t('published');?>");
@@ -65,7 +65,7 @@ function toggle(element){
 				});
 			}
 			else{
-				$this=this;	
+				$this=this;
 				$.post(CI.base_url+'/admin/catalog/publish/'+studyid+'/0?ajax=1', {submit:"submit"}, function( data ) {
 					$($this).html("<?php echo t('draft');?>");
 					$($this).attr("data-value",0);
@@ -617,13 +617,16 @@ function set_data_access_display(el)
 
 <div class="container-fluid study-edit-page">
 
-
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="error">'.$error.'</div>' : '';?>
+<?php if ($error!=""):?>
+	<div class="alert alert-danger alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+		<?php echo $error;?>
+	</div>
+<?php endif;?>
 
 <?php $message=$this->session->flashdata('message');?>
 <?php if ($message!=""):?>
-	<div style="margin-top:15px;" class="success alert alert-success alert-dismissible">
+	<div class="alert alert-success alert-dismissible">
 		<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 		<?php echo $message;?>
 	</div>
@@ -637,7 +640,7 @@ function set_data_access_display(el)
 
 <div class="row">
 <div class="col-md-12 edit-page-header">
-		
+
 	<div class="col-md-11">
 		<h1 class="study-title"><?php echo $title; ?></h1>
 	</div>
diff --git a/application/views/catalog/index.php b/application/views/catalog/index.php
index a7291ac52..36997effb 100644
--- a/application/views/catalog/index.php
+++ b/application/views/catalog/index.php
@@ -11,11 +11,23 @@
 <div class="container-fluid">
 <?php //$this->load->view('catalog/catalog_page_links');?>
 
-<?php $error=$this->session->flashdata('error');?>
-<?php echo ($error!="") ? '<div class="alert alert-danger">'.$error.'</div>' : '';?>
+<?php $error=$this->session->flashdata('error'); ?>
+<?php if ($error!=""):?>
+	<div class="alert alert-danger alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true">×</span>
+		</button><?php echo $error;?>
+	</div>
+<?php endif;?>
 
 <?php $message=$this->session->flashdata('message');?>
-<?php echo ($message!="") ? '<div class="alert alert-success">'.$message.'</div>' : '';?>
+<?php if ($message!=""):?>
+	<div class="alert alert-success alert-dismissible">
+		<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+			<span aria-hidden="true">×</span>
+		</button><?php echo $message;?>
+	</div>
+<?php endif;?>
 
 <h1 class="page-title">
 	<?php echo t('catalog_maintenance');?>