diff --git a/mapper/src/App.css b/mapper/src/App.css
index a881e55..9891eb5 100644
--- a/mapper/src/App.css
+++ b/mapper/src/App.css
@@ -167,6 +167,15 @@ h2 {
 	font-family: sans-serif;
 }
 
+.datepicker .rdtPicker .rdtDay.rdtDisabled {
+	color: #ce7e7e !important;
+}
+
+.datepicker .rdtPicker .rdtDay.rdtNew,
+.datepicker .rdtPicker .rdtDay.rdtOld {
+	color: #c8c8c8;
+}
+
 .datepicker th:hover,
 .datepicker td:hover {
 	background-color: #999!important;
diff --git a/mapper/src/App.js b/mapper/src/App.js
index 1536703..432bb40 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 UintArray(digest)];
+	const resultBytes = [...new Uint8Array(digest)];
 	return resultBytes.map(x => x.toString(16).padStart(2, '0')).join('');
 }
 
@@ -338,8 +338,8 @@ function Menu({duration, setDuration, end, setEnd, slider, setSlider, submenu, s
 	const range = parseSlider(end, duration, slider);
 	const startDate = moment(end).subtract(...duration.delta);
 
-	const isPrevDisabled = shareStart ? moment(startDate).subtract(...duration.delta).isBefore(shareStart) : false;
-	const isNextDisabled = shareEnd ? moment(end).add(...duration.delta).isAfter(shareEnd) : false;
+	const isPrevDisabled = shareStart ? moment(startDate).isBefore(shareStart) : false;
+	const isNextDisabled = shareEnd ? moment(end).add(1, 'day').isAfter(shareEnd) : false;
 
 	const isValidDate = (current) => {
 		if (!shareStart || !shareEnd) {
@@ -348,7 +348,7 @@ function Menu({duration, setDuration, end, setEnd, slider, setSlider, submenu, s
 		const proposedDate = moment(current).startOf('day');
 
 		const isAfterOrOnShareStart = proposedDate.isSameOrAfter(shareStart, 'day');
-		const isBeforeOrOnShareEnd = proposedDate.isSameOrBefore(shareEnd, 'day');
+		const isBeforeOrOnShareEnd = proposedDate.isBefore(shareEnd, 'day');
 
 		return isAfterOrOnShareStart && isBeforeOrOnShareEnd;
 	};