diff --git a/opossum/src/properties/mod.rs b/opossum/src/properties/mod.rs
index b1d6541f3f28bd301b43d55a3370c95a1f44f8f5..5cc89ba64fced8db54c408151787921aee189cb5 100644
--- a/opossum/src/properties/mod.rs
+++ b/opossum/src/properties/mod.rs
@@ -3,6 +3,7 @@ pub mod property;
 pub mod proptype;
 
 use log::warn;
+use petgraph::visit::NodeRef;
 pub use property::Property;
 pub use proptype::{PropCondition, Proptype};
 
@@ -152,7 +153,7 @@ impl Properties {
             } else {
                 uuid
             };
-            if let Ok(html_prop_value) = prop.1.prop().to_html(node_name, node_uuid) {
+            if let Ok(html_prop_value) = prop.1.prop().to_html((prop.0.to_owned() + "_"+node_name).as_str(), node_uuid) {
                 let html_prop = HtmlProperty {
                     name: prop.0.to_owned(),
                     description: prop.1.description().into(),
@@ -176,7 +177,7 @@ impl Properties {
     /// returns an error.
     pub fn export_data(&self, report_path: &Path, id: &str) -> OpmResult<()> {
         for prop in &self.props {
-            prop.1.export_data(report_path, id)?;
+            prop.1.export_data(report_path, (prop.0.to_owned()+"_" + id).as_str())?;
         }
         Ok(())
     }
diff --git a/opossum/src/surface/hit_map.rs b/opossum/src/surface/hit_map.rs
index 6aa5af55849a4ed55208f9247bbde087b8c359d3..d4925846ec2c2e3df9194bbf3749657302003ece 100644
--- a/opossum/src/surface/hit_map.rs
+++ b/opossum/src/surface/hit_map.rs
@@ -128,8 +128,8 @@ impl Plottable for HitMap {
         x_min *= f64::powi(10., -x_exponent);
         y_min *= f64::powi(10., -y_exponent);
 
-        let x_limits = AxLims::create_useful_axlims(x_min * 1.1, x_max * 1.1);
-        let y_limits = AxLims::create_useful_axlims(y_min * 1.1, y_max * 1.1);
+        let x_limits = AxLims::create_useful_axlims(x_min -0.1*(x_max -x_min), x_max +0.1*(x_max -x_min));
+        let y_limits = AxLims::create_useful_axlims(y_min -0.1*(y_max -y_min), y_max +0.1*(y_max -y_min));
 
         plt_type.set_plot_param(&PlotArgs::XLim(x_limits))?;
         plt_type.set_plot_param(&PlotArgs::YLim(y_limits))?;