diff --git a/mapper/src/App.js b/mapper/src/App.js
index 876f435..bfbc794 100644
--- a/mapper/src/App.js
+++ b/mapper/src/App.js
@@ -40,7 +40,7 @@ const parseSlider = (end, duration, slider) => {
 async function sha256(source) {
 	const sourceBytes = new TextEncoder().encode(source);
 	const digest = await crypto.subtle.digest('SHA-256', sourceBytes);
-	const resultBytes = [...new Uint8Array(digest)];
+	const resultBytes = [...new UintArray(digest)];
 	return resultBytes.map(x => x.toString(16).padStart(2, '0')).join('');
 }
 
@@ -336,6 +336,7 @@ function Menu({duration, setDuration, end, setEnd, slider, setSlider, submenu, s
 	};
 
 	const range = parseSlider(end, duration, slider);
+	const startDate = moment(end).subtract(...duration.delta);
 
 	const shareRange = async () => {
 		const shareStart = moment(range[0]).unix();
@@ -440,6 +441,7 @@ function Menu({duration, setDuration, end, setEnd, slider, setSlider, submenu, s
 									input={false}
 									timeFormat={false}
 									onChange={(x) => chooseEnd(x)}
+									value={startDate}
 								/>
 							</div>
 
@@ -500,7 +502,7 @@ function Menu({duration, setDuration, end, setEnd, slider, setSlider, submenu, s
 					onClick={() => setSubmenu('end')}
 					className={submenu === 'end' ? 'active' : ''}
 				>
-					{moment(end).subtract(duration.delta[0], duration.delta[1]).format('dd MMM DD')}
+					{startDate.format('dd MMM DD')}
 				</button>
 
 				<button