diff --git a/server.py b/server.py
index d649965..a8d0417 100644
--- a/server.py
+++ b/server.py
@@ -19,7 +19,7 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 class VisualizationElement:
-	"""
+    """
     Defines an element of the visualization.
     Attributes:
         package_includes: A list of external JavaScript files to include that
@@ -32,190 +32,197 @@ class VisualizationElement:
                 to the client.
     """
 
-	package_includes = []
-	local_includes = []
-	js_code = ''
-	render_args = {}
+    package_includes = []
+    local_includes = []
+    js_code = ''
+    render_args = {}
 
-	def __init__(self):
-		pass
+    def __init__(self):
+        pass
 
-	def render(self, model):
-		return '<b>VisualizationElement goes here</b>.'
+    def render(self, model):
+        return '<b>VisualizationElement goes here</b>.'
 
 
 class PageHandler(tornado.web.RequestHandler):
-	""" Handler for the HTML template which holds the visualization. """
+    """ Handler for the HTML template which holds the visualization. """
 
-	def get(self):
-		self.render('index.html', port=self.application.port,
-					model_name=self.application.model_name,
-					package_includes=self.application.package_includes,
-					local_includes=self.application.local_includes,
-					scripts=self.application.js_code)
+    def get(self):
+        self.render('index.html', port=self.application.port,
+                    model_name=self.application.model_name,
+                    package_includes=self.application.package_includes,
+                    local_includes=self.application.local_includes,
+                    scripts=self.application.js_code)
 
 
 class SocketHandler(tornado.websocket.WebSocketHandler):
 
-	def open(self):
-		if self.application.verbose:
-			logger.info('Socket opened!')
-		
+    def open(self):
+        if self.application.verbose:
+            logger.info('Socket opened!')
 
-	def check_origin(self, origin):
-		return True
+    def check_origin(self, origin):
+        return True
 
-	def on_message(self, message):
-		""" Receiving a message from the websocket, parse, and act accordingly. """
+    def on_message(self, message):
+        """ Receiving a message from the websocket, parse, and act accordingly. """
 
-		msg = tornado.escape.json_decode(message)
+        msg = tornado.escape.json_decode(message)
 
-		if msg['type'] == 'config_file':
+        if msg['type'] == 'config_file':
 
-			if self.application.verbose:
-				print(msg['data'])
+            if self.application.verbose:
+                print(msg['data'])
 
-			config = list(yaml.load_all(msg['data']))
+            self.config = list(yaml.load_all(msg['data']))
 
-			if len(config) > 1:
-				error = 'Please, provide only one configuration.'
-				if self.application.verbose:
-					logger.error(error)
-				self.write_message({'type': 'error',
-					'error': error})
-				return
-			else:
-				config = config[0]
-				self.send_log('INFO.soil', 'Using config: {name}'.format(name=config['name']))
+            if len(self.config) > 1:
+                error = 'Please, provide only one configuration.'
+                if self.application.verbose:
+                    logger.error(error)
+                self.write_message({'type': 'error',
+                    'error': error})
+                return
+            else:
+                self.config = self.config[0]
+                self.send_log('INFO.soil', 'Using config: {name}'.format(name=self.config['name']))
 
-			self.name = config['name']
+            self.name = self.config['name']
 
-			settings = []
-			for key in config['environment_params']: 
-				if type(config['environment_params'][key]) == float:
-					setting_type = 'number'
-				elif type(config['environment_params'][key]) == bool:
-					setting_type = 'boolean'
-				else:
-					setting_type = 'undefined'
+            self.run_simulation()
 
-				settings.append({
-					'label': key,
-					'type': setting_type,
-					'value': config['environment_params'][key]
-				})
+            settings = []
+            for key in self.config['environment_params']: 
+                if type(self.config['environment_params'][key]) == float:
+                    setting_type = 'number'
+                elif type(self.config['environment_params'][key]) == bool:
+                    setting_type = 'boolean'
+                else:
+                    setting_type = 'undefined'
 
-			self.write_message({'type': 'settings',
-				'data': settings})
-			
-			# Run simulation and capture logs
-			with self.logging(self.application.model.name):
-				self.application.model.run(config)
+                settings.append({
+                    'label': key,
+                    'type': setting_type,
+                    'value': self.config['environment_params'][key]
+                })
 
-			trials = []
-			for i in range(config['num_trials']):
-				trials.append('{}_trial_{}'.format(self.name, i))
-			self.write_message({'type': 'trials',
-				'data': trials })
+            self.write_message({'type': 'settings',
+                'data': settings})
 
-		elif msg['type'] == 'get_trial':
-			if self.application.verbose:
-				logger.info('Trial {} requested!'.format(msg['data']))
-			self.send_log('INFO.user', 'Trial {} requested!'.format(msg['data']))
-			self.write_message({'type': 'get_trial',
-				'data': self.application.model.get_trial(self.name, msg['data']) })
+        elif msg['type'] == 'get_trial':
+            if self.application.verbose:
+                logger.info('Trial {} requested!'.format(msg['data']))
+            self.send_log('INFO.user', 'Trial {} requested!'.format(msg['data']))
+            self.write_message({'type': 'get_trial',
+                'data': self.application.model.get_trial(self.name, msg['data']) })
 
-		else:
-			if self.application.verbose:
-				logger.info('Unexpected message!')
+        elif msg['type'] == 'run_simulation':
+            self.send_log('INFO.soil', 'Running new simulation for {name}'.format(name=self.config['name']))
+            self.config['environment_params'] = msg['data']
+            self.run_simulation()
 
-	def update_logging(self):
-		try:
-			if (not self.log_capture_string.closed and self.log_capture_string.getvalue()):
-				self.send_log('INFO.soil', self.log_capture_string.getvalue())
-				self.log_capture_string.truncate(0)
-				self.log_capture_string.seek(0)
-		finally:
-			if self.capture_logging:
-				thread = threading.Timer(0.001, self.update_logging)
-				thread.start()
+        else:
+            if self.application.verbose:
+                logger.info('Unexpected message!')
 
-	def on_close(self):
-		logger.info('Socket closed!')
+    def update_logging(self):
+        try:
+            if (not self.log_capture_string.closed and self.log_capture_string.getvalue()):
+                self.send_log('INFO.soil', self.log_capture_string.getvalue())
+                self.log_capture_string.truncate(0)
+                self.log_capture_string.seek(0)
+        finally:
+            if self.capture_logging:
+                thread = threading.Timer(0.001, self.update_logging)
+                thread.start()
 
-	def send_log(self, logger, logging):
-		self.write_message({'type': 'log',
-			'logger': logger,
-			'logging': logging })
+    def on_close(self):
+        logger.info('Socket closed!')
 
-	@contextmanager
-	def logging(self, logger):
-		self.capture_logging = True
-		self.logger_application = logging.getLogger(logger)
-		self.log_capture_string = io.StringIO()
-		ch = logging.StreamHandler(self.log_capture_string)
-		self.logger_application.addHandler(ch)
-		self.update_logging()
-		yield self.capture_logging
+    def send_log(self, logger, logging):
+        self.write_message({'type': 'log',
+            'logger': logger,
+            'logging': logging })
 
-		self.log_capture_string.close()
-		self.logger_application.removeHandler(ch)
-		self.capture_logging = False
-		return self.capture_logging
-	
+    def run_simulation(self):
+        # Run simulation and capture logs
+        with self.logging(self.application.model.name):
+            self.application.model.run(self.config)
+
+        trials = []
+        for i in range(self.config['num_trials']):
+            trials.append('{}_trial_{}'.format(self.name, i))
+        self.write_message({'type': 'trials',
+            'data': trials })
+
+    @contextmanager
+    def logging(self, logger):
+        self.capture_logging = True
+        self.logger_application = logging.getLogger(logger)
+        self.log_capture_string = io.StringIO()
+        ch = logging.StreamHandler(self.log_capture_string)
+        self.logger_application.addHandler(ch)
+        self.update_logging()
+        yield self.capture_logging
+
+        self.log_capture_string.close()
+        self.logger_application.removeHandler(ch)
+        self.capture_logging = False
+        return self.capture_logging
+    
 
 class ModularServer(tornado.web.Application):
-	""" Main visualization application. """
+    """ Main visualization application. """
 
-	portrayal_method = None
-	port = 8001
-	model_args = ()
-	model_kwargs = {}
-	page_handler = (r'/', PageHandler)
-	socket_handler = (r'/ws', SocketHandler)
-	static_handler = (r'/(.*)', tornado.web.StaticFileHandler,
-					  {'path': 'templates'})
-	local_handler = (r'/local/(.*)', tornado.web.StaticFileHandler,
-					 {'path': ''})
+    portrayal_method = None
+    port = 8001
+    model_args = ()
+    model_kwargs = {}
+    page_handler = (r'/', PageHandler)
+    socket_handler = (r'/ws', SocketHandler)
+    static_handler = (r'/(.*)', tornado.web.StaticFileHandler,
+                      {'path': 'templates'})
+    local_handler = (r'/local/(.*)', tornado.web.StaticFileHandler,
+                     {'path': ''})
 
-	handlers = [page_handler, socket_handler, static_handler, local_handler]
-	settings = {'debug': True,
-				'template_path': os.path.dirname(__file__) + '/templates'}
+    handlers = [page_handler, socket_handler, static_handler, local_handler]
+    settings = {'debug': True,
+                'template_path': os.path.dirname(__file__) + '/templates'}
 
-	def __init__(self, model, visualization_element, name='SOIL Model', verbose=True,
-				 *args, **kwargs):
-		
-		self.verbose = verbose
-		self.package_includes = set()
-		self.local_includes = set()
-		self.js_code = []
-		
-		self.visualization_element = visualization_element
+    def __init__(self, model, visualization_element, name='SOIL Model', verbose=True,
+                 *args, **kwargs):
+        
+        self.verbose = verbose
+        self.package_includes = set()
+        self.local_includes = set()
+        self.js_code = []
+        
+        self.visualization_element = visualization_element
 
-		self.model_name = name
-		self.model = model
-		self.model_args = args
-		self.model_kwargs = kwargs
-		#self.reset_model()
+        self.model_name = name
+        self.model = model
+        self.model_args = args
+        self.model_kwargs = kwargs
+        #self.reset_model()
 
-		# Initializing the application itself:
-		super().__init__(self.handlers, **self.settings)
+        # Initializing the application itself:
+        super().__init__(self.handlers, **self.settings)
 
-	'''
-	def reset_model(self):
-		self.model = self.model_cls(*self.model_args, **self.model_kwargs)
-	'''
+    '''
+    def reset_model(self):
+        self.model = self.model_cls(*self.model_args, **self.model_kwargs)
+    '''
 
-	def render_model(self):
-		return self.visualization_element.render(self.model)
+    def render_model(self):
+        return self.visualization_element.render(self.model)
 
-	def launch(self, port=None):
-		""" Run the app. """
-		
-		if port is not None:
-			self.port = port
-		url = 'http://127.0.0.1:{PORT}'.format(PORT=self.port)
-		print('Interface starting at {url}'.format(url=url))
-		self.listen(self.port)
-		# webbrowser.open(url)
-		tornado.ioloop.IOLoop.instance().start()
+    def launch(self, port=None):
+        """ Run the app. """
+        
+        if port is not None:
+            self.port = port
+        url = 'http://127.0.0.1:{PORT}'.format(PORT=self.port)
+        print('Interface starting at {url}'.format(url=url))
+        self.listen(self.port)
+        # webbrowser.open(url)
+        tornado.ioloop.IOLoop.instance().start()
diff --git a/templates/css/main.css b/templates/css/main.css
index e329697..6168a65 100644
--- a/templates/css/main.css
+++ b/templates/css/main.css
@@ -24,6 +24,10 @@ html, body {
   margin-right: 10px !important;
 }
 
+.nav.navbar-right a {
+  outline: none !important;
+}
+
 .dropdown-menu > li > a:hover {
   background-color: #d4d3d3;
   cursor: pointer;
@@ -398,3 +402,9 @@ table#link-distance .max {
   justify-content: center;
   align-items: center;
 }
+
+/** MODAL **/
+.modal-footer, 
+.modal-header {
+  border: none !important;
+}
diff --git a/templates/index.html b/templates/index.html
index c81c55d..f51c8eb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -97,40 +97,38 @@
         $('.config-item #properties').change(function() {
             self.GraphVisualization.update_graph($(this).val(), slider.value(), function() {
                 update_statistics_table();
-            })
+            });
         });
 
-        chart_nodes = c3.generate({
-            size: {
-                width: width_chart,
-                height: height_chart
-            },
-            data: { 
-                columns: [],
-                type: 'area-spline'
-            },
-            axis: {
-                x: { label: 'Time' },
-                y: { label: 'Number of nodes' }
-            },
-            point: { show: false },
-            bindto: '#chart_nodes'
+        // Run simulation
+        $('#simulation_modal .btn-success').click(function() {
+            if ( !jQuery.isEmptyObject(run_simulation()) ) {
+                self.GraphVisualization.reset();
+                $('#load').show().addClass('loader');;
+                _socket.send(run_simulation(), 'run_simulation');
+                $('.console').append('<br/>');
+            }
+            $('#simulation_modal').modal('hide')
         });
-        chart_attrs = c3.generate({
-            size: {
-                width: width_chart,
-                height: height_chart
-            },
-            data: {
-                columns: [],
-                type: 'area-spline'
-            },
-            axis: {
-                x: { label: 'Time' },
-                y: { label: 'Attributes' }
-            },
-            point: { show: false },
-            bindto: '#chart_attrs'
+
+        chart_nodes = create_chart(width_chart, height_chart, 'Time', 'Number of nodes', '#chart_nodes');
+        chart_attrs = create_chart(width_chart, height_chart, 'Time', 'Attributes', '#chart_attrs');
+
+        // Fill modal window
+        $('#simulation_modal').on('show.bs.modal', function(e) {
+            var variables = run_simulation()
+            var x = 0,
+                row;
+            for (var i in variables) {
+                if ( x % 2 === 0 ) row = $('<tr>').appendTo('#simulation_modal table tbody');
+                $('<td>').text(i).appendTo(row);
+                $('<td>').text(variables[i]).appendTo(row);
+                x++;
+            }
+        });
+
+        $('#simulation_modal').on('hide.bs.modal', function(e) {
+            $('#simulation_modal table tbody').empty();
         });
     }
 
@@ -190,7 +188,7 @@
                 </li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <li><a href="#">Run simulation</a></li>
+                <li><a href="#" id="run_simulation" role="button">Run simulation</a></li>
             </ul>
         </div>
         <script type="text/javascript">
@@ -319,6 +317,29 @@
 
 </div>
 
+<div class="modal fade" tabindex="-1" role="dialog" id="simulation_modal">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title">New simulation</h4>
+            </div>
+            <div class="modal-body">
+                <p>You are going to run a new simulation, all charts and trials are going to be lost. A new ones will be available after the simulation.</p>
+                <p>Check your new environment variables for this simulation.</p>
+                <table class="table">
+                    <thead><tr><th>Variable</th><th>Value</th><th>Variable</th><th>Value</th></tr></thead>
+                    <tbody></tbody>
+                </table>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" data-dismiss="modal">Cancel</button>
+                <button type="button" class="btn btn-success">Run</button>
+            </div>
+        </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
 
 </body>
 </html>
\ No newline at end of file
diff --git a/templates/js/socket.js b/templates/js/socket.js
index c08167a..bfa031d 100755
--- a/templates/js/socket.js
+++ b/templates/js/socket.js
@@ -9,123 +9,128 @@ ws.onopen = function() {
 
 // Receive data from server
 ws.onmessage = function(message) {
-	//console.log('Message received!');
+    //console.log('Message received!');
 
-	var msg = JSON.parse(message.data);
+    var msg = JSON.parse(message.data);
 
-	switch(msg['type']) {
-		case 'trials':
-			$('#load').removeClass('loader');
-			reset_trials();
-			set_trials(msg['data']);
-			break;
+    switch(msg['type']) {
+        case 'trials':
+            $('#load').removeClass('loader');
+            reset_trials();
+            set_trials(msg['data']);
+            break;
 
-		case 'get_trial':
-			console.log(msg['data']);
-			GraphVisualization.import(convertJSON(msg['data']['graph']), msg['data']['models'], function() {
-				$('#load').hide();
-				reset_configuration();
-				set_configuration();
-				$('#home_menu').click(function() {
-					setTimeout(function() {
-						reset_timeline();
-						set_timeline(msg['data']['graph']);
-					}, 1000);
-				});
-				reset_timeline();
-				set_timeline(msg['data']['graph']);
-			});
-			$('#charts .chart').removeClass('no-data');
-			set_chart_nodes(msg['data']['graph'], chart_nodes)
-			set_chart_attrs(msg['data']['graph'], chart_attrs, $('.config-item #properties').val())
-			break;
+        case 'get_trial':
+            console.log(msg['data']);
+            GraphVisualization.import(convertJSON(msg['data']['graph']), msg['data']['models'], function() {
+                $('#load').hide();
+                reset_configuration();
+                set_configuration();
+                $('#home_menu').click(function() {
+                    setTimeout(function() {
+                        reset_timeline();
+                        set_timeline(msg['data']['graph']);
+                    }, 1000);
+                });
+                reset_timeline();
+                set_timeline(msg['data']['graph']);
+            });
+            $('#charts .chart').removeClass('no-data');
+            set_chart_nodes(msg['data']['graph'], chart_nodes)
+            set_chart_attrs(msg['data']['graph'], chart_attrs, $('.config-item #properties').val())
+            $('.config-item #properties').change(function() {
+                chart_attrs.destroy();
+                chart_attrs = create_chart(width_chart, height_chart, 'Time', 'Attributes', '#chart_attrs');
+                set_chart_attrs(msg['data']['graph'], chart_attrs, $('.config-item #properties').val())
+            });
+            break;
 
-		case 'settings':
-			$('#wrapper-settings').empty().removeClass('none');
-			initGUI(msg['data']);
-			break;
+        case 'settings':
+            $('#wrapper-settings').empty().removeClass('none');
+            initGUI(msg['data']);
+            break;
 
-		case 'error':
-			console.log(msg['error']);
-			_socket.error(msg['error']);
-			$('#load').removeClass('loader');
-			break;
+        case 'error':
+            console.log(msg['error']);
+            _socket.error(msg['error']);
+            $('#load').removeClass('loader');
+            break;
 
-		case 'log':
-			$('.console').append('$ ' + msg['logger'] + ': ' + msg['logging'] + '<br/>');
-        	$('.console').animate({ scrollTop: $('.console')[0].scrollHeight }, 'slow');
-        	break;
+        case 'log':
+            $('.console').append('$ ' + msg['logger'] + ': ' + msg['logging'] + '<br/>');
+            $('.console').animate({ scrollTop: $('.console')[0].scrollHeight }, 'slow');
+            break;
 
-		default:
-			console.log('Unexpected message!')
-	}
+        default:
+            console.log('Unexpected message!')
+    }
 
 }
 
 var _socket = {
-	send: function(message, type) {
-		var json = {}
-		json['type'] = type
-		json['data'] = message
-		ws.send(JSON.stringify(json))
-	},
-	error: function(message) {
-		$('#error-message').text(message);
-		$('.alert.alert-danger').show();
-	}
+    send: function(message, type) {
+        var json = {}
+        json['type'] = type
+        json['data'] = message
+        ws.send(JSON.stringify(json))
+    },
+    error: function(message) {
+        $('#error-message').text(message);
+        $('.alert.alert-danger').show();
+    }
 };
 
 var set_trials = function(trials) {
-	for ( i in trials ) {
-		var list_item = $('<li>').appendTo('.dropdown#trials .dropdown-menu');
-		$('<a>').val(i).text(trials[i]).appendTo(list_item);
-	}
-	// Select 'trials'
+    for ( i in trials ) {
+        var list_item = $('<li>').appendTo('.dropdown#trials .dropdown-menu');
+        $('<a>').val(i).text(trials[i]).appendTo(list_item);
+    }
+    // Select 'trials'
     $('.dropdown#trials li a').click(function() {
-		var a = $('.dropdown-toggle .caret');
-		$('.dropdown-toggle').text($(this).text() + ' ').append(a);
+        var a = $('.dropdown-toggle .caret');
+        $('.dropdown-toggle').text($(this).text() + ' ').append(a);
         _socket.send($(this).val(), 'get_trial');
     });
-	// Request first trial as default
-	_socket.send(0, 'get_trial')
+    // Request first trial as default
+    _socket.send(0, 'get_trial')
 };
 
 var reset_trials = function() {
-	// 'Trials' selector
+    // 'Trials' selector
     $('.dropdown-menu').empty();
     var a = $('.dropdown-toggle .caret');
-	$('.dropdown-toggle').text('Trials ').append(a);
+    $('.dropdown-toggle').text('Trials ').append(a);
 }
 
 var convertJSON = function(json) {
-	json.links.forEach(function(link) {
-		link.source = json.nodes[link.source]
-		link.target = json.nodes[link.target]
-	});
-	// Fix spells for nodes
-	json.nodes.forEach(function(node) {
-		for (i in node.spells) {
-			if (node.spells[i][0] > node.spells[i][1]) {
-				aux = node.spells[i][0];
-				node.spells[i][0] = node.spells[i][1];
-				node.spells[i][1] = aux;
-			}
-		}
-	});
-	return json;
+    json.links.forEach(function(link) {
+        link.source = json.nodes[link.source]
+        link.target = json.nodes[link.target]
+    });
+    // Fix spells for nodes
+    json.nodes.forEach(function(node) {
+        for (i in node.spells) {
+            if (node.spells[i][0] > node.spells[i][1]) {
+                aux = node.spells[i][0];
+                node.spells[i][0] = node.spells[i][1];
+                node.spells[i][1] = aux;
+            }
+        }
+    });
+    return json;
 }
 
 var update_statistics_table = function() {
 
-	$('#percentTable tbody').empty()
+    $('#percentTable tbody').empty()
 
-	var statisticsSorted = Object.keys(self.GraphVisualization.statistics).sort(function(a,b) {
+    var statisticsSorted = Object.keys(self.GraphVisualization.statistics).sort(function(a,b) {
         return self.GraphVisualization.statistics[b] - self.GraphVisualization.statistics[a];
     });
 
-	for ( var i in statisticsSorted ) {
-		if ( i <= 5 ) {
-			// Draw table
+    for ( var i in statisticsSorted ) {
+        if ( i <= 5 ) {
+            // Draw table
             var appendTo = '#percentTable > tbody tr:nth-child(' + Number(parseInt(i) + 1) + ')';
             var propertyName = (statisticsSorted[i].includes('class')) ? 
                                         statisticsSorted[i].split('.').pop().split('\'')[0] : statisticsSorted[i];
@@ -134,12 +139,12 @@ var update_statistics_table = function() {
             $('<td>').css('background-color', self.GraphVisualization.color(statisticsSorted[i])).addClass('col-sm-1').appendTo(appendTo);
             $('<td>').addClass('text-left col-sm-4').text(self.GraphVisualization.statistics[statisticsSorted[i]] + ' %').appendTo(appendTo);
             $('<td>').addClass('text-right col-sm-6 property-name').text(propertyName).appendTo(appendTo);
-		}
-	}
+        }
+    }
 }
 
 var set_configuration = function() {
-	// Number of nodes and links info table
+    // Number of nodes and links info table
     $('<tr>').appendTo('#info-graph > tbody');
     $('<th>').text('Nodes:').appendTo('#info-graph > tbody tr:nth-child(1)');
     $('<th>').text(self.GraphVisualization.nodes).addClass('text-right').appendTo('#info-graph > tbody tr:nth-child(1)');
@@ -151,31 +156,34 @@ var set_configuration = function() {
     // Options of 'Select'
     for ( var i in self.GraphVisualization.model['dynamic'] ) {
         $('<option>').val(self.GraphVisualization.model['dynamic'][i].title)
-        			 .text(self.GraphVisualization.model['dynamic'][i].title).appendTo('#properties-dynamic');
+                     .text(self.GraphVisualization.model['dynamic'][i].title).appendTo('#properties-dynamic');
     }
     for ( var i in self.GraphVisualization.model['static'] ) {
         $('<option>').val(self.GraphVisualization.model['static'][i].title)
-        			 .text(self.GraphVisualization.model['static'][i].title).appendTo('#properties-static');
+                     .text(self.GraphVisualization.model['static'][i].title).appendTo('#properties-static');
     }
 
     // Hide optgroups if they are empty
     if ( $('#properties-dynamic').children().length === 0 ) $('#properties-dynamic').hide();
-    if ( $('#properties-static').children().length === 0 ) 	$('#properties-static').hide();
+    if ( $('#properties-static').children().length === 0 )  $('#properties-static').hide();
 
     update_statistics_table();
 
     // Enable 'Link Distance' slider
-	$('#link-distance-slider').slider('enable').on('change', function(value) {
-		self.GraphVisualization.set_link_distance(value.value.newValue);
-	});
+    $('#link-distance-slider').slider('enable').on('change', function(value) {
+        self.GraphVisualization.set_link_distance(value.value.newValue);
+    });
+
+    // Enable 'Run configuration' button
+    $('#run_simulation').attr('data-toggle', 'modal').attr('data-target', '#simulation_modal');
 }
 
 var reset_configuration = function() {
-	// Information table about the graph
-	$('#info-graph > tbody').empty();
+    // Information table about the graph
+    $('#info-graph > tbody').empty();
 
-	// 'Select' for properties
-	$('#properties-dynamic').empty().show();
+    // 'Select' for properties
+    $('#properties-dynamic').empty().show();
     $('#properties-static').empty().show();
 
     // 'Link Distance' slider
@@ -183,35 +191,35 @@ var reset_configuration = function() {
 }
 
 var set_timeline = function(graph) {
-	// 'Timeline' slider
-	var [min, max] = get_limits(graph);
+    // 'Timeline' slider
+    var [min, max] = get_limits(graph);
 
-	var stepUnix = (max - min) / 200;
-	var minUnix  = (min !== Math.min()) ? min : 0;
+    var stepUnix = (max - min) / 200;
+    var minUnix  = (min !== Math.min()) ? min : 0;
     var maxUnix  = (max !== Math.max()) ? max : minUnix + 20;
 
-	slider = d3.slider();
-	d3.select('#slider3').attr('width', width).call(
-		slider.axis(true).min(minUnix).max(maxUnix).step(stepUnix).value(maxUnix)
-		.on('slide', function(evt, value) {
-			self.GraphVisualization.update_graph($('.config-item #properties').val(), value, function() {
-				update_statistics_table();
-			});
-		})
-	);
+    slider = d3.slider();
+    d3.select('#slider3').attr('width', width).call(
+        slider.axis(true).min(minUnix).max(maxUnix).step(stepUnix).value(maxUnix)
+        .on('slide', function(evt, value) {
+            self.GraphVisualization.update_graph($('.config-item #properties').val(), value, function() {
+                update_statistics_table();
+            });
+        })
+    );
 
-	// Draw graph for the first time
-	self.GraphVisualization.update_graph($('.config-item #properties').val(), maxUnix, function() {
-		update_statistics_table();
-	});
+    // Draw graph for the first time
+    self.GraphVisualization.update_graph($('.config-item #properties').val(), maxUnix, function() {
+        update_statistics_table();
+    });
 
-	// 'Speed' slider
-	$('#speed-slider').slider('enable').on('change', function(value) {
+    // 'Speed' slider
+    $('#speed-slider').slider('enable').on('change', function(value) {
         speed = value.value.newValue;
     });
 
-	// Button 'Play'
-	$('button#button_play').on('click', function() {
+    // Button 'Play'
+    $('button#button_play').on('click', function() {
 
         $('button#button_play').addClass('pressed').prop("disabled", true);
         $('#speed-slider').slider('disable');
@@ -220,8 +228,8 @@ var set_timeline = function(graph) {
         if (slider.value() >= maxUnix) {
             slider.value(minUnix);
             self.GraphVisualization.update_graph($('.config-item #properties').val(), slider.value(), function() {
-				update_statistics_table();
-			});
+                update_statistics_table();
+            });
             setTimeout(player, 1000);
         } else {
             player();
@@ -231,9 +239,9 @@ var set_timeline = function(graph) {
         function player() {
             clearInterval(play);
             play = setInterval(function() {
-            	self.GraphVisualization.update_graph($('.config-item #properties').val(), slider.value(), function() {
-					update_statistics_table();
-				});
+                self.GraphVisualization.update_graph($('.config-item #properties').val(), slider.value(), function() {
+                    update_statistics_table();
+                });
 
                 if (slider.value() + slider.step() >= maxUnix) {
                     slider.value(maxUnix);
@@ -250,93 +258,130 @@ var set_timeline = function(graph) {
         }
     });
 
-	// Button 'Pause'
-	$('button#button_pause').on('click', function() {
+    // Button 'Pause'
+    $('button#button_pause').on('click', function() {
         clearInterval(play);
         slider.step(stepUnix);
         $('button#button_play').removeClass('pressed').prop("disabled", false);
         $('#speed-slider').slider('enable');
     });
 
-	// Button 'Zoom to Fit'
+    // Button 'Zoom to Fit'
     $('button#button_zoomFit').click(function() { self.GraphVisualization.fit(); });
 }
 
 var reset_timeline = function() {
-	// 'Timeline' slider
-	$('#slider3').html('');
+    // 'Timeline' slider
+    $('#slider3').html('');
 
-	// 'Speed' slider
-	$('#speed-slider').slider('disable').slider('setValue', 1000);
+    // 'Speed' slider
+    $('#speed-slider').slider('disable').slider('setValue', 1000);
 
-	// Buttons
-	clearInterval(play);
+    // Buttons
+    clearInterval(play);
     $('button#button_play').off().removeClass('pressed').prop("disabled", false);
     $('button#button_pause').off();
     $('button#button_zoomFit').off();
 }
 
 var get_limits = function(graph) {
-	var max = Math.max();
-	var min = Math.min()
-	graph.links.forEach(function(link) {
-		if (link.end 	> max) max = link.end
-		if (link.start 	> max) max = link.start
-		if (link.end 	< min) min = link.end
-		if (link.start 	< min) min = link.start
-	});
-	graph.nodes.forEach(function(node) {
-		for (property in node) {
-			if ( Array.isArray(node[property]) ) {
+    var max = Math.max();
+    var min = Math.min()
+    graph.links.forEach(function(link) {
+        if (link.end    > max) max = link.end
+        if (link.start  > max) max = link.start
+        if (link.end    < min) min = link.end
+        if (link.start  < min) min = link.start
+    });
+    graph.nodes.forEach(function(node) {
+        for (property in node) {
+            if ( Array.isArray(node[property]) ) {
 
-				for (i in node[property]) {
-					for (j in node[property][i]) {
-						if (node[property][i][j] > max) max = node[property][i][j];
-						if (node[property][i][j] < min) min = node[property][i][j];
-					}
-				}
+                for (i in node[property]) {
+                    for (j in node[property][i]) {
+                        if (node[property][i][j] > max) max = node[property][i][j];
+                        if (node[property][i][j] < min) min = node[property][i][j];
+                    }
+                }
 
-			}
-		}
-	})
-	return [min, max];
+            }
+        }
+    })
+    return [min, max];
 }
 
 var set_chart_nodes = function(graph, chart) {
-	var [min, max] = get_limits(graph);
-	var data = ['nodes']
-	for (var i = min; i <= max; i++) {
-		data.push(this.GraphVisualization.get_nodes(i));
-	}
-	chart.load({
-		unload: true,
-		columns: [data]
-	});
+    var [min, max] = get_limits(graph);
+    var data = ['nodes']
+    for (var i = min; i <= max; i++) {
+        data.push(this.GraphVisualization.get_nodes(i));
+    }
+    chart.load({
+        unload: true,
+        columns: [data]
+    });
 }
 
 var set_chart_attrs = function(graph, chart, property) {
-	var [min, max] = get_limits(graph);
-	var data_tmp = {}
-	for (var i = min; i <= max; i++) {
-		this.GraphVisualization.get_attributes(property, i, function(object) {
-			for (var value in object) {
-				if (!data_tmp[value]) {
-					var time = 0
-					for (var done in data_tmp)
-						time = (data_tmp[done].length > time) ? data_tmp[done].length - 1 : time
-					data_tmp[value] = Array(time).fill(0);
-				}
-				data_tmp[value].push(object[value]);
-			}
-		});
-	}
-	var data = $.map(data_tmp, function(value, index) {
-		value.splice(0,0,index);
-		return [value];
-	});
-	chart.load({
-		unload: true,
-		columns: data
-	});
-	chart.axis.labels({y: property});
+    var [min, max] = get_limits(graph);
+    var data_tmp = {}
+    for (var i = min; i <= max; i++) {
+        this.GraphVisualization.get_attributes(property, i, function(object) {
+            for (var value in object) {
+                if (!data_tmp[value]) {
+                    var time = 0
+                    for (var done in data_tmp)
+                        time = (data_tmp[done].length > time) ? data_tmp[done].length - 1 : time
+                    data_tmp[value] = Array(time).fill(0);
+                }
+                data_tmp[value].push(object[value]);
+            }
+        });
+    }
+    var data = $.map(data_tmp, function(value, index) {
+        value.splice(0,0,index);
+        return [value];
+    });
+    chart.load({
+        unload: true,
+        columns: data
+    });
+    chart.axis.labels({y: property});
+}
+
+var create_chart = function(width, height, label_x, label_y, bind_to) {
+    return c3.generate({
+        size: {
+            width: width,
+            height: height
+        },
+        data: {
+            columns: [],
+            type: 'area-spline'
+        },
+        axis: {
+            x: { label: label_x },
+            y: { label: label_y }
+        },
+        point: { show: false },
+        bindto: bind_to
+    });
+}
+
+var run_simulation = function() {
+    var environment_variables = {}
+    $('#wrapper-settings input').each(function() {
+        switch(this.type) {
+            case 'text':
+                environment_variables[this.id] = Number(this.value);
+                break;
+            case 'checkbox':
+                environment_variables[this.id] = ($(this).is(':checked')) ? true : false;
+                break;
+            default:
+                break;
+        }
+        
+    });
+    return environment_variables;
 }
diff --git a/templates/js/template.js b/templates/js/template.js
index ea1e5d7..8990082 100644
--- a/templates/js/template.js
+++ b/templates/js/template.js
@@ -1,10 +1,6 @@
 // Add model parameters that can be edited prior to a model run
 var initGUI = function(model_params) {
 
-    var onSubmitCallback = function(param_name, value) {
-        // SEND SOCKET REQUEST
-    };
-
     var addBooleanInput = function(name, value) {
         var checked = (value) ? 'checked' : 'value';
 
@@ -79,14 +75,14 @@ var initGUI = function(model_params) {
         var param_str = String(option);
 
         switch (model_params[option]['type']) {
-            case "boolean":
+            case 'boolean':
                 addBooleanInput(model_params[option]['label'], model_params[option]['value']);
                 break;
-            case "number":
+            case 'number':
                 addSliderInput(model_params[option]['label'], model_params[option]['value']);
                 break;
-            case "object":
-                addParamInput(param_str, model_params[option]);    // catch-all for params that use Option class
+            default:
+                console.log('Input type not defined!');
                 break;
         }
     }
diff --git a/templates/js/visualization.js b/templates/js/visualization.js
index 12c938f..bcca4f0 100644
--- a/templates/js/visualization.js
+++ b/templates/js/visualization.js
@@ -294,17 +294,17 @@
   function importJSON(json, attributes, callback) {
     reset()
     graph = json;
-    model = attributes
+    model = attributes;
 
     // Create the graph itself
     Graph();
 
     self.GraphVisualization.nodes = graph.nodes.length;
     self.GraphVisualization.links = graph.links.length;
-    self.GraphVisualization.model = model
+    self.GraphVisualization.model = model;
 
     // Draw graph with default property and time for the first time
-    update_data(model.dynamic[0].title, 0)
+    update_data(model.dynamic[0].title, 0);
 
     if (callback) { callback(); }
   }
diff --git a/visualization.py b/visualization.py
index 5356aaa..14ef3c5 100644
--- a/visualization.py
+++ b/visualization.py
@@ -7,63 +7,63 @@ from xml.etree import ElementTree
 
 class Model():
 
-	def __init__(self, dump=True, dir_path='output'):
-		self.name = 'soil'
-		self.dump = dump
-		self.dir_path = dir_path
+    def __init__(self, dump=True, dir_path='output'):
+        self.name = 'soil'
+        self.dump = dump
+        self.dir_path = dir_path
 
-	def run(self, config):
-		name = config['name']
-		print('Using config(s): {name}'.format(name=name))
+    def run(self, config):
+        name = config['name']
+        print('Using config(s): {name}'.format(name=name))
 
-		sim = SoilSimulation(**config)
-		sim.dir_path = os.path.join(self.dir_path, name)
-		sim.dump = self.dump
+        sim = SoilSimulation(**config)
+        sim.dir_path = os.path.join(self.dir_path, name)
+        sim.dump = self.dump
 
-		print('Dumping results to {} : {}'.format(sim.dir_path, sim.dump))
-		
-		sim.run_simulation()
+        print('Dumping results to {} : {}'.format(sim.dir_path, sim.dump))
+        
+        sim.run_simulation()
 
 
-	def get_trial(self, name, trial):
-		graph = nx.read_gexf(os.path.join(self.dir_path, name, '{}_trial_{}.gexf'.format(name, trial)))
+    def get_trial(self, name, trial):
+        graph = nx.read_gexf(os.path.join(self.dir_path, name, '{}_trial_{}.gexf'.format(name, trial)))
 
-		attributes = self.get_attributes(os.path.join(self.dir_path, name, '{}_trial_{}.gexf'.format(name, trial)))
-		json = {}
-		json['graph'] = nx.node_link_data(graph)
-		json['models'] = attributes
-		return json
+        attributes = self.get_attributes(os.path.join(self.dir_path, name, '{}_trial_{}.gexf'.format(name, trial)))
+        json = {}
+        json['graph'] = nx.node_link_data(graph)
+        json['models'] = attributes
+        return json
 
-	def reset(self):
-		pass
+    def reset(self):
+        pass
 
-	def get_attributes(self, path_gexf):
-		attributes = {}
-		tree = ElementTree.parse(path_gexf)
-		root = tree.getroot()
+    def get_attributes(self, path_gexf):
+        attributes = {}
+        tree = ElementTree.parse(path_gexf)
+        root = tree.getroot()
 
-		ns = { 'gexf': 'http://www.gexf.net/1.2draft' }
+        ns = { 'gexf': 'http://www.gexf.net/1.2draft' }
 
-		for mode in root[0].findall('gexf:attributes', ns):
-			attributes[mode.attrib['mode']] = []
-			for attribute in mode:
-				values = {
-					'id'	: attribute.attrib['id'],
-					'title'	: attribute.attrib['title'],
-					'type'	: attribute.attrib['type']
-				}
-				attributes[mode.attrib['mode']].append(values)
+        for mode in root[0].findall('gexf:attributes', ns):
+            attributes[mode.attrib['mode']] = []
+            for attribute in mode:
+                values = {
+                    'id'    : attribute.attrib['id'],
+                    'title' : attribute.attrib['title'],
+                    'type'  : attribute.attrib['type']
+                }
+                attributes[mode.attrib['mode']].append(values)
 
-		return attributes
+        return attributes
 
 
 class GraphVisualization(VisualizationElement):
-	package_includes = []
+    package_includes = []
 
-	# TODO: esta por definir todos los ajustes de simulacion
-	def __init__(self, params=None):
-		new_element = ("new funcion()")
-		self.js_code = "elements.push(" + new_element + ");"
+    # TODO: esta por definir todos los ajustes de simulacion
+    def __init__(self, params=None):
+        new_element = ("new funcion()")
+        self.js_code = "elements.push(" + new_element + ");"
 
-	def render(self, model):
-		pass
+    def render(self, model):
+        pass