diff --git a/client/src/App.js b/client/src/App.js
index 52e7ef8..e7bb01a 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -158,10 +158,12 @@ function SolarPower({end, duration}) {
 				domain={[0, 10]}
 				orientation='right'
 				hide={true}
+				width={35}
 			/>
 			<YAxis
 				yAxisId='left'
 				domain={[0, 6000]}
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>
@@ -220,11 +222,13 @@ function Temperature({name, sensorName, end, duration, yDomain, showHumidity, sh
 					domain={[0, 100]}
 					orientation='right'
 					hide={true}
+					width={35}
 				/>
 			}
 			<YAxis
 				yAxisId={showHumidity ? 'left' : undefined}
 				domain={yDomain}
+				width={35}
 			/>
 			<CartesianGrid strokeDasharray='3 3'/>
 			<Tooltip
@@ -290,10 +294,12 @@ function Thermostat({end, duration}) {
 				domain={[0, 6]}
 				orientation='right'
 				hide={true}
+				width={35}
 			/>
 			<YAxis
 				yAxisId='left'
 				domain={[12, 30]}
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>
@@ -363,9 +369,11 @@ function Gas({end, duration}) {
 				domain={data.length ? [data[0].consumption_data, data.slice(-1)[0].consumption_data] : [100, 0]}
 				orientation='right'
 				hide={true}
+				width={35}
 			/>
 			<YAxis
 				yAxisId='left'
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>
@@ -422,9 +430,11 @@ function Water({end, duration}) {
 				domain={data.length ? [data[0].consumption_data, data.slice(-1)[0].consumption_data] : [100, 0]}
 				orientation='right'
 				hide={true}
+				width={35}
 			/>
 			<YAxis
 				yAxisId='left'
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>
@@ -477,6 +487,7 @@ function LivingRoomDust({end, duration}) {
 			/>
 			<YAxis
 				domain={[0, 20]}
+				width={35}
 			/>
 			<CartesianGrid strokeDasharray='3 3'/>
 			<Tooltip
@@ -522,16 +533,19 @@ function Air({name, sensorName, end, duration}) {
 				domain={[400, 1000]}
 				orientation='right'
 				hide={true}
+				width={35}
 			/>
 			<YAxis
 				yAxisId='voc'
 				domain={[0, 250]}
 				orientation='right'
 				hide={true}
+				width={35}
 			/>
 			<YAxis
 				yAxisId='pm'
 				domain={[0, 20]}
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>
@@ -610,6 +624,7 @@ function BedroomSleep({end, duration}) {
 			/>
 			<YAxis
 				domain={[5, 20]}
+				width={35}
 			/>
 			<CartesianGrid strokeDasharray='3 3'/>
 			<Tooltip
@@ -653,6 +668,7 @@ function Lux({name, sensorName, end, duration}) {
 			<YAxis
 				yAxisId='lux'
 				domain={[0, 250]}
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>
@@ -752,7 +768,7 @@ function MultiLineChart({title, measurement, dataKey, sensors, colors, end, dura
 			loading={loading}
 		>
 			<XAxis dataKey='time' minTickGap={5} tickFormatter={tickFormatter} ticks={ticks} />
-			<YAxis domain={yDomain} />
+			<YAxis domain={yDomain} width={35} />
 			<CartesianGrid strokeDasharray='3 3'/>
 			<Tooltip
 				formatter={(v, name) => v.toFixed(1) + (units[unitKey] || '')}
@@ -797,6 +813,7 @@ function Soil({name, sensorName, end, duration}) {
 			<YAxis
 				yAxisId='soil'
 				domain={[0, 1000]}
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>
@@ -843,6 +860,7 @@ function WH51Soil({name, sensorName, end, duration}) {
 			<YAxis
 				yAxisId='soil'
 				domain={[0, 100]}
+				width={35}
 			/>
 
 			<CartesianGrid strokeDasharray='3 3'/>