diff --git a/src/js/charts/AggregationChart.js b/src/js/charts/AggregationChart.js
index 68f4699..a5bfec8 100644
--- a/src/js/charts/AggregationChart.js
+++ b/src/js/charts/AggregationChart.js
@@ -67,6 +67,9 @@ export default class AggregationChart extends BaseChart {
 			let divisor = Math.floor(
 				(this.width - getExtraWidth(this.measures))/barWidth
 			);
+			if (this.legendTotals.length < divisor) {
+				barWidth = this.width/this.legendTotals.length;
+			}
 			if(count > divisor) {
 				count = 0;
 				y += 20;
diff --git a/src/js/charts/PercentageChart.js b/src/js/charts/PercentageChart.js
index beb80b1..cd91469 100644
--- a/src/js/charts/PercentageChart.js
+++ b/src/js/charts/PercentageChart.js
@@ -19,7 +19,7 @@ export default class PercentageChart extends AggregationChart {
 		b.depth = b.depth || PERCENTAGE_BAR_DEFAULT_DEPTH;
 
 		m.paddings.right = 30;
-		m.legendHeight = 80;
+		m.legendHeight = 60;
 		m.baseHeight = (b.height + b.depth * 0.5) * 8;
 	}