diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5816c1b5..226d38a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+- [#253](https://github.com/os2display/display-admin-client/pull/253)
+  - Refactored scheduling to increase user experience.
+  - Added interval and count to rrule inputs.
 - [#249](https://github.com/os2display/display-admin-client/pull/249)
   - Set infrastructure node version to 20.
   - Fixed base path to /admin in vite setup.
diff --git a/package.json b/package.json
index bd50910b..583c73bd 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "react-select": "^5.2.2",
     "react-table": "^7.7.0",
     "react-toastify": "^10.0.0",
+    "react-tooltip": "^5.28.0",
     "rrule": "^2.7.2",
     "typescript": "^4.4.2",
     "ulid": "^2.3.0",
diff --git a/src/components/util/forms/form-input.jsx b/src/components/util/forms/form-input.jsx
index 27316ff0..78eae152 100644
--- a/src/components/util/forms/form-input.jsx
+++ b/src/components/util/forms/form-input.jsx
@@ -2,6 +2,7 @@ import { React } from "react";
 import PropTypes from "prop-types";
 import { FormControl, FormGroup, FormLabel, InputGroup } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
+import Tooltip from "../tooltip";
 
 /**
  * An input for forms.
@@ -19,6 +20,7 @@ import { useTranslation } from "react-i18next";
  * @param {string} props.formGroupClasses Classes for the form group
  * @param {boolean} props.disabled If the input is disabled
  * @param {boolean} props.required If the input is required
+ * @param {string | null} props.tooltip Tooltip text. Does not display if null.
  * @param {object | null} props.inputGroupExtra Extra elements for input group.
  * @returns {object} An input.
  */
@@ -36,6 +38,7 @@ function FormInput({
   label = null,
   inputGroupExtra = null,
   required = false,
+  tooltip = null,
   ...rest
 }) {
   const { t } = useTranslation("common");
@@ -43,12 +46,15 @@ function FormInput({
   /* eslint-disable react/jsx-props-no-spreading */
   return (
     <FormGroup className={formGroupClasses}>
-      {label && (
+      {label && (<>
         <FormLabel htmlFor={name}>
           {label}
           {required && " *"}
         </FormLabel>
-      )}
+        {tooltip !== null && (
+          <Tooltip id={`tooltip-${name}`} content={tooltip} />
+        )}
+      </>)}
       <InputGroup hasValidation>
         <FormControl
           name={name}
@@ -84,6 +90,7 @@ FormInput.propTypes = {
   disabled: PropTypes.bool,
   required: PropTypes.bool,
   inputGroupExtra: PropTypes.node,
+  tooltip: PropTypes.string,
 };
 
 export default FormInput;
diff --git a/src/components/util/forms/select.jsx b/src/components/util/forms/select.jsx
index d10d6ae1..eed64548 100644
--- a/src/components/util/forms/select.jsx
+++ b/src/components/util/forms/select.jsx
@@ -2,6 +2,9 @@ import { React, useEffect, useState } from "react";
 import PropTypes from "prop-types";
 import { FormGroup } from "react-bootstrap";
 import { useTranslation } from "react-i18next";
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {faQuestionCircle} from "@fortawesome/free-solid-svg-icons";
+import {Tooltip} from "react-tooltip";
 
 /**
  * @param {object} props The props.
@@ -16,6 +19,7 @@ import { useTranslation } from "react-i18next";
  * @param {string} props.formGroupClasses The classes for the form-group element.
  * @param {boolean} props.isRequired If the select is required.
  * @param {boolean} props.allowNull Add null option.
+ * @param {string | null} props.tooltip Tooltip text. Does not display if null.
  * @returns {object} The select component.
  */
 function Select({
@@ -30,6 +34,7 @@ function Select({
   formGroupClasses = "",
   isRequired = false,
   allowNull = true,
+  tooltip = null,
 }) {
   const { t } = useTranslation("common");
   const textOnError = errorText || t("select.validation-text");
@@ -61,6 +66,16 @@ function Select({
         {label}
         {required && " *"}
       </label>
+      {tooltip !== null && (
+        <>
+          <a data-tooltip-id={`tooltip-${name}`}> <FontAwesomeIcon icon={faQuestionCircle} className="text-black-50" /></a>
+          <Tooltip
+            id={`tooltip-${name}`}
+            openOnClick={true}
+            content={tooltip}
+          />
+        </>
+      )}
       <select
         className={classes}
         required={isRequired}
diff --git a/src/components/util/schedule/duration.jsx b/src/components/util/schedule/duration.jsx
deleted file mode 100644
index 7ec47c00..00000000
--- a/src/components/util/schedule/duration.jsx
+++ /dev/null
@@ -1,93 +0,0 @@
-import { React, useEffect, useState } from "react";
-import PropTypes from "prop-types";
-import { useTranslation } from "react-i18next";
-import { InputGroup } from "react-bootstrap";
-import FormInput from "../forms/form-input";
-
-/**
- * Duration component.
- *
- * @param {object} props - The props.
- * @param {string} props.label - Label.
- * @param {number} props.duration - Input duration
- * @param {Function} props.onChange - OnChange function.
- * @returns {object} - Component.
- */
-function Duration({ label, duration, onChange }) {
-  const { t } = useTranslation("common");
-  const [minutes, setMinutes] = useState();
-  const [hours, setHours] = useState();
-
-  const onValueChange = ({ target }) => {
-    const targetValue = parseInt(target.value, 10);
-
-    if (target.id === "duration_hour") {
-      onChange(minutes * 60 + targetValue * 3600);
-    } else if (target.id === "duration_minute") {
-      onChange(targetValue * 60 + hours * 3600);
-    }
-  };
-
-  useEffect(() => {
-    if (duration !== undefined) {
-      const seconds = duration % 60;
-      const durationWithoutSeconds = duration - seconds;
-      const newMinutes = durationWithoutSeconds / 60;
-      const minutesLeft = newMinutes % 60;
-      const newHours = (durationWithoutSeconds - minutesLeft * 60) / 3600;
-
-      setHours(newHours);
-      setMinutes(minutesLeft);
-    }
-  }, [duration]);
-
-  return (
-    <div className="row">
-      <label className="mb-2" htmlFor="duration_hour">
-        {label}
-      </label>
-      <div className="col">
-        <FormInput
-          label={null}
-          value={hours}
-          onChange={onValueChange}
-          name="duration_hour"
-          type="number"
-          min="0"
-          aria-label={t("duration.hours")}
-          aria-describedby="duration-hours"
-          inputGroupExtra={
-            <InputGroup.Text id="duration-hours">
-              {t("duration.hours")}
-            </InputGroup.Text>
-          }
-        />
-      </div>
-      <div className="col">
-        <FormInput
-          label={null}
-          value={minutes}
-          onChange={onValueChange}
-          name="duration_minute"
-          type="number"
-          min="0"
-          aria-label={t("duration.minutes")}
-          aria-describedby="duration-minutes"
-          inputGroupExtra={
-            <InputGroup.Text id="duration-minutes">
-              {t("duration.minutes")}
-            </InputGroup.Text>
-          }
-        />
-      </div>
-    </div>
-  );
-}
-
-Duration.propTypes = {
-  label: PropTypes.string.isRequired,
-  duration: PropTypes.number.isRequired,
-  onChange: PropTypes.func.isRequired,
-};
-
-export default Duration;
diff --git a/src/components/util/schedule/schedule-util.js b/src/components/util/schedule/schedule-util.js
index f2a778d7..e5f3fadf 100644
--- a/src/components/util/schedule/schedule-util.js
+++ b/src/components/util/schedule/schedule-util.js
@@ -11,8 +11,6 @@ dayjs.extend(localizedFormat);
 /**
  * Get rrule string from schedule.
  *
- *
- *
  * @param {object} schedule - The schedule.
  * @returns {string} - RRule string.
  */
@@ -33,7 +31,9 @@ const getRruleString = (schedule) => {
     wkst: schedule.wkst ?? RRule.MO,
     freq: schedule.freq,
     dtstart: schedule.dtstart,
+    count: schedule.count,
     until: schedule.until,
+    interval: schedule.interval,
     byhour: schedule.byhour,
     byminute: schedule.byminute,
     bysecond,
@@ -56,8 +56,10 @@ const createNewSchedule = () => {
 
   const newSchedule = {
     id: ulid(nowTimestamp),
-    duration: 60 * 60 * 24, // Default one day.
-    freq: RRule.WEEKLY,
+    duration: 60 * 60, // Default 1 hour.
+    freq: RRule.DAILY,
+    count: 1,
+    interval: null,
     // For evaluation with the RRule library we pretend that "now" is in UTC instead of the local timezone.
     // That is 9:00 in Europe/Copenhagen time will be evaluated as if it was 9:00 in UTC.
     // @see https://github.com/jkbrzt/rrule#important-use-utc-dates
@@ -121,10 +123,11 @@ const createScheduleFromRRule = (id, duration, rruleString) => {
  * Get array of count occurrences of rrule.
  *
  * @param {RRule} rrule - The rrule.
- * @param {number | null} count - The max number of occurrences.
+ * @param {number} duration - The duration of an occurrence in seconds.
+ * @param {number} count - The max number of occurrences.
  * @returns {Array} - The occurrences.
  */
-const getNextOccurrences = (rrule, count = 5) => {
+const getNextOccurrences = (rrule, duration = 0, count = 5) => {
   const occurrences = [];
 
   const newRrule = new RRule(rrule.origOptions);
@@ -133,6 +136,7 @@ const getNextOccurrences = (rrule, count = 5) => {
     occurrences.push({
       key: `occurrence${occurrences.length}`,
       text: dayjs(d).utc().locale("da").format("LLLL"),
+      end: dayjs(d).utc().add(duration, 'second').locale("da").format("LLLL"),
     });
     return true;
   });
@@ -156,12 +160,6 @@ const getFreqOptions = (t) => {
     },
     { title: t("schedule.weekly"), value: RRule.WEEKLY, key: "rrule.weekly" },
     { title: t("schedule.daily"), value: RRule.DAILY, key: "rrule.daily" },
-    { title: t("schedule.hourly"), value: RRule.HOURLY, key: "rrule.hourly" },
-    {
-      title: t("schedule.minutely"),
-      value: RRule.MINUTELY,
-      key: "rrule.minutely",
-    },
   ];
 };
 
diff --git a/src/components/util/schedule/schedule.jsx b/src/components/util/schedule/schedule.jsx
index 50e86fe8..7e931d4e 100644
--- a/src/components/util/schedule/schedule.jsx
+++ b/src/components/util/schedule/schedule.jsx
@@ -17,7 +17,8 @@ import {
   getNextOccurrences,
   getRruleString,
 } from "./schedule-util";
-import Duration from "./duration";
+import FormCheckbox from "../forms/form-checkbox";
+import Tooltip from "../tooltip";
 
 dayjs.extend(utc);
 
@@ -37,7 +38,8 @@ function Schedule({ schedules, onChange }) {
   const byWeekdayOptions = getByWeekdayOptions(t);
   const byMonthOptions = getByMonthOptions(t);
   const [localSchedules, setLocalSchedules] = useState([]);
-  const [showRRuleDetails, setShowRRuleDetails] = useState(false);
+  const [durationError, setDurationError] = useState(false);
+  const [activatedRepeatIds, setActivatedRepeatIds] = useState({});
 
   useEffect(() => {
     const newSchedules = schedules.map((schedule) =>
@@ -169,10 +171,87 @@ function Schedule({ schedules, onChange }) {
     const { value } = target;
     const split = value.split(":");
 
-    changeSchedule(scheduleId, "byhour", parseInt(split[0], 10));
-    changeSchedule(scheduleId, "byminute", parseInt(split[1], 10));
+    const hour = parseInt(split[0], 10);
+    const minute = parseInt(split[1], 10);
+
+    if (isNaN(hour) || isNaN(minute)) {
+      changeSchedule(scheduleId, "byhour", null);
+      changeSchedule(scheduleId, "byminute", null);
+    } else {
+      changeSchedule(scheduleId, "byhour", hour);
+      changeSchedule(scheduleId, "byminute", minute);
+    }
   };
 
+  const setDuration = (scheduleId, schedule, target) => {
+    const value = target.value;
+
+    const start = dayjs(schedule.dtstart).utc().format("YYYY-MM-DDTHH:mm");
+    const end = dayjs(value);
+    const diff = end.diff(start, 'seconds');
+
+    if (diff < 0) {
+      setDurationError(true)
+    } else {
+      setDurationError(false);
+
+      changeSchedule(scheduleId, 'duration', diff);
+    }
+  }
+
+  const setPositiveNumberOrNull = (scheduleId, target) => {
+    const value = target.value;
+
+    if (isNaN(value) || value <= 0) {
+      changeSchedule(scheduleId, target.id, null);
+    } else {
+      changeSchedule(scheduleId, target.id, value);
+    }
+  }
+
+  const isRepeatingEvent = (schedule) => {
+    return !(
+      schedule.freq === RRule.DAILY &&
+      schedule.count === 1 &&
+      schedule.until === undefined &&
+      schedule.interval === undefined &&
+      schedule.byhour === undefined &&
+      schedule.byminute === undefined &&
+      schedule.byweekday === undefined &&
+      schedule.bymonth === undefined &&
+      schedule.byweekno === undefined);
+  }
+
+  const displayRepeat = (schedule) => {
+    return isRepeatingEvent(schedule) || activatedRepeatIds[schedule.id] === true;
+  }
+
+  const updateActivatedRepeats = (id, value) => {
+    const updated = {...activatedRepeatIds};
+    updated[id] = value;
+    setActivatedRepeatIds(updated);
+  }
+
+  const toggleRepeat = (schedule) => {
+    if (displayRepeat(schedule)) {
+      // Disable repeating schedule.
+      changeSchedule(schedule.id, 'freq', RRule.DAILY);
+      changeSchedule(schedule.id, 'count', 1);
+      changeSchedule(schedule.id, 'interval', null);
+      changeSchedule(schedule.id, 'until', null);
+      changeSchedule(schedule.id, 'byhour', null);
+      changeSchedule(schedule.id, 'byminute', null);
+      changeSchedule(schedule.id, 'byweekday', null);
+      changeSchedule(schedule.id, 'bymonth', null);
+      changeSchedule(schedule.id, 'byweekno', null);
+      updateActivatedRepeats(schedule.id, false);
+    } else {
+      // Activate repeating schedule.
+      changeSchedule(schedule.id, 'count', null);
+      updateActivatedRepeats(schedule.id, true);
+    }
+  }
+
   return (
     <div className="Schedule">
       <Button
@@ -184,11 +263,27 @@ function Schedule({ schedules, onChange }) {
         {t("schedule.add-schedule-button-text")}
       </Button>
 
+      <div>
+        <small>{t('schedule.helptext')}</small>
+      </div>
+
       {localSchedules &&
         localSchedules.map((schedule, index) => (
           <div key={schedule.id} className="Schedule-item card mt-2 mb-2">
             <div className="card-header">
-              {t("schedule.plan")} #{index + 1}
+              <div className="row">
+                <div className="col">
+                  {t("schedule.plan")} #{index + 1}
+                </div>
+                <div className="col d-flex justify-content-end">
+                  <Button
+                    variant="danger"
+                    onClick={() => removeSchedule(schedule.id)}
+                  >
+                    {t("schedule.remove")}
+                  </Button>
+                </div>
+              </div>
             </div>
 
             <div className="card-body container">
@@ -198,171 +293,204 @@ function Schedule({ schedules, onChange }) {
                     label={t("schedule.dtstart")}
                     value={getDateValue(schedule.dtstart)}
                     name="dtstart"
-                    onChange={({ target }) => setDateValue(schedule.id, target)}
+                    onChange={({target}) => setDateValue(schedule.id, target)}
                     type="datetime-local"
+                    tooltip={t('schedule.dtstart-tooltip')}
                   />
                 </div>
                 <div className="col">
                   <FormInput
-                    label={t("schedule.until")}
-                    value={getDateValue(schedule.until)}
-                    name="until"
-                    onChange={({ target }) => setDateValue(schedule.id, target)}
+                    label={t("schedule.end")}
+                    value={getDateValue(new Date(schedule.dtstart.getTime() + schedule.duration * 1000))}
+                    name="end"
+                    onChange={({target}) => setDuration(schedule.id, schedule, target)}
                     type="datetime-local"
+                    className={durationError ? 'border-danger' : ''}
+                    tooltip={t('schedule.end-tooltip')}
                   />
+                  {durationError && <small className="text-danger" style={{fontStyle: 'italic'}}>{t('schedule.duration-error')}</small>}
                 </div>
               </div>
-              <div className="row mt-2">
-                <div className="col">
-                  <Duration
-                    duration={schedule.duration}
-                    onChange={(newValue) => {
-                      changeSchedule(schedule.id, "duration", newValue);
-                    }}
-                    label={t("schedule.duration")}
-                  />
-                </div>
-                <div className="col">
-                  <FormInput
-                    onChange={({ target }) => setTimeValue(schedule.id, target)}
-                    value={getTimeValue(schedule.byhour, schedule.byminute)}
-                    label={t("schedule.bytime")}
-                    type="time"
-                    name="bytime"
-                  />
-                </div>
-              </div>
-              <div className="row mt-2">
-                <div className="col">
-                  <Select
-                    onChange={({ target }) =>
-                      changeSchedule(schedule.id, target.id, target.value)
-                    }
-                    value={schedule.freq}
-                    label={t("schedule.freq")}
-                    name="freq"
-                    options={freqOptions}
-                    allowNull={false}
-                  />
-                </div>
-                <div className="col">
-                  <FormGroup>
-                    <label htmlFor="byweekday">{t("schedule.byweekday")}</label>
-                    <MultiSelect
-                      className="mt-2"
-                      options={byWeekdayOptions}
-                      value={
-                        schedule.byweekday
-                          ? schedule.byweekday.map((weekdayNumber) =>
-                              byWeekdayOptions.find(
-                                (weekDay) => weekDay.value === weekdayNumber
-                              )
-                            )
-                          : []
-                      }
-                      name="byweekday"
-                      disableSearch
-                      overrideStrings={{
-                        allItemsAreSelected: t("schedule.all-selected"),
-                        clearSelected: t("schedule.clear-selection"),
-                        selectAll: t("schedule.selected-all"),
-                        selectSomeItems: t("schedule.select-some-options"),
-                      }}
-                      labelledBy="Select"
-                      onChange={(value) => {
-                        changeSchedule(
-                          schedule.id,
-                          "byweekday",
-                          value.map((v) => v.value)
-                        );
-                      }}
-                    />
-                  </FormGroup>
-                </div>
-              </div>
-
-              <div className="row mt-2">
-                <div className="col">
-                  <FormGroup>
-                    <label htmlFor="bymonth" className="mb-2">
-                      {t("schedule.bymonth")}
-                    </label>
-                    <MultiSelect
-                      options={byMonthOptions}
-                      value={getByMonthValue(schedule.bymonth)}
-                      name="bymonth"
-                      disableSearch
-                      labelledBy="Select"
-                      overrideStrings={{
-                        allItemsAreSelected: t("schedule.all-selected"),
-                        clearSelected: t("schedule.clear-selection"),
-                        selectAll: t("schedule.selected-all"),
-                        selectSomeItems: t("schedule.select-some-options"),
-                      }}
-                      onChange={(values) =>
-                        changeSchedule(
-                          schedule.id,
-                          "bymonth",
-                          values.map((v) => v.value)
-                        )
-                      }
-                    />
-                  </FormGroup>
-                </div>
-                <div className="col">
-                  <FormInput
-                    disabled={schedule.freq !== RRule.YEARLY}
-                    label={t("schedule.byweekno")}
-                    value={schedule.byweekno ?? ""}
-                    onChange={({ target }) =>
-                      changeSchedule(schedule.id, target.id, target.value)
-                    }
-                    name="byweekno"
-                    type="number"
-                    min="0"
-                    max="52"
+              <div className="card mt-3">
+                <div className="card-body">
+                  <FormCheckbox
+                    onChange={() => toggleRepeat(schedule)}
+                    name="enableRepeat"
+                    type="checkbox"
+                    value={displayRepeat(schedule)}
+                    label={t('schedule.enable-repeat')}
+                    formGroupClasses="d-inline-block mb-2"
                   />
-                </div>
-              </div>
-            </div>
+                  <Tooltip id={'tooltip-enable-repeat'} content={t('schedule.enable-repeat-tooltip')}></Tooltip>
 
-            <div className="card-footer">
-              <div className="row">
-                <div className="col d-flex justify-content-end">
-                  <Button
-                    id="schedule_details_button"
-                    className="mt-2 mb-2 me-2"
-                    variant="secondary"
-                    onClick={() => setShowRRuleDetails(!showRRuleDetails)}
-                  >
-                    {showRRuleDetails
-                      ? t("schedule.hide-details")
-                      : t("schedule.show-details")}
-                  </Button>
-                  <Button
-                    className="mt-2 mb-2"
-                    variant="danger"
-                    onClick={() => removeSchedule(schedule.id)}
-                  >
-                    {t("schedule.remove")}
-                  </Button>
+                  {displayRepeat(schedule) && (
+                    <>
+                      <div className="row mt-2">
+                        <div className={`col col-md-${!isNaN(schedule.byhour) ? "3" : "6"}`}>
+                          <Select
+                            onChange={({target}) =>
+                              changeSchedule(schedule.id, target.id, target.value)
+                            }
+                            value={schedule.freq}
+                            label={t("schedule.freq")}
+                            name="freq"
+                            options={freqOptions}
+                            allowNull={false}
+                            tooltip={t('schedule.frequency-tooltip')}
+                          />
+                        </div>
+                        <div className="col col-md-3">
+                          <FormInput
+                            onChange={({target}) => setPositiveNumberOrNull(schedule.id, target)}
+                            value={schedule.interval ?? ''}
+                            label={t("schedule.interval")}
+                            type="search"
+                            name="interval"
+                            tooltip={t('schedule.interval-tooltip')}
+                          />
+                        </div>
+                        <div className="col col-md-3">
+                          <FormInput
+                            onChange={({target}) => setPositiveNumberOrNull(schedule.id, target)}
+                            value={schedule.count ?? ''}
+                            label={t("schedule.count")}
+                            placeholder={t('schedule.count-placeholder')}
+                            type="search"
+                            name="count"
+                            tooltip={t('schedule.count-tooltip')}
+                          />
+                        </div>
+                        {!isNaN(schedule.byhour) && (
+                          <div className="col col-md-3">
+                            <FormInput
+                              onChange={({target}) => setTimeValue(schedule.id, target)}
+                              value={getTimeValue(schedule.byhour, schedule.byminute)}
+                              label={t("schedule.bytime")}
+                              type="time"
+                              name="bytime"
+                              tooltip={t('schedule.bytime-tooltip')}
+                            />
+                          </div>
+                        )}
+                      </div>
+                      <div className="row mt-2">
+                        <div className="col">
+                          <FormGroup>
+                            <label htmlFor="byweekday">{t("schedule.byweekday")}</label>
+                            <Tooltip id={'tooltip-byweekday'} content={t('schedule.byweekday-tooltip')}></Tooltip>
+                            <MultiSelect
+                              className="mt-2"
+                              options={byWeekdayOptions}
+                              value={
+                                schedule.byweekday
+                                  ? schedule.byweekday.map((weekdayNumber) =>
+                                    byWeekdayOptions.find(
+                                      (weekDay) => weekDay.value === weekdayNumber
+                                    )
+                                  )
+                                  : []
+                              }
+                              name="byweekday"
+                              disableSearch
+                              overrideStrings={{
+                                allItemsAreSelected: t("schedule.all-selected"),
+                                clearSelected: t("schedule.clear-selection"),
+                                selectAll: t("schedule.selected-all"),
+                                selectSomeItems: t("schedule.select-some-options"),
+                              }}
+                              labelledBy="Select"
+                              onChange={(value) => {
+                                changeSchedule(
+                                  schedule.id,
+                                  "byweekday",
+                                  value.map((v) => v.value)
+                                );
+                              }}
+                            />
+                          </FormGroup>
+                        </div>
+                        <div className="col">
+                          <FormGroup>
+                            <label htmlFor="bymonth" className="mb-2">
+                              {t("schedule.bymonth")}
+                            </label>
+                            <Tooltip id={'tooltip-bymonth'} content={t('schedule.bymonth-tooltip')}></Tooltip>
+                            <MultiSelect
+                              options={byMonthOptions}
+                              value={getByMonthValue(schedule.bymonth)}
+                              name="bymonth"
+                              disableSearch
+                              labelledBy="Select"
+                              overrideStrings={{
+                                allItemsAreSelected: t("schedule.all-selected"),
+                                clearSelected: t("schedule.clear-selection"),
+                                selectAll: t("schedule.selected-all"),
+                                selectSomeItems: t("schedule.select-some-options"),
+                              }}
+                              onChange={(values) =>
+                                changeSchedule(
+                                  schedule.id,
+                                  "bymonth",
+                                  values.map((v) => v.value)
+                                )
+                              }
+                            />
+                          </FormGroup>
+                        </div>
+                      </div>
+                      <div className="row mt-2">
+                        <div className="col col-md-6">
+                          <FormInput
+                            label={t("schedule.until")}
+                            value={getDateValue(schedule.until)}
+                            name="until"
+                            onChange={({target}) => setDateValue(schedule.id, target)}
+                            type="datetime-local"
+                            tooltip={t('schedule.until-tooltip')}
+                          />
+                        </div>
+                        {schedule.freq === RRule.YEARLY && (
+                          <div className="col">
+                            <FormInput
+                              disabled={schedule.freq !== RRule.YEARLY}
+                              label={t("schedule.byweekno")}
+                              value={schedule.byweekno ?? ""}
+                              onChange={({target}) =>
+                                changeSchedule(schedule.id, target.id, target.value)
+                              }
+                              name="byweekno"
+                              type="number"
+                              min="0"
+                              max="52"
+                              tooltip={t('schedule.byweekno-tooltip')}
+                            />
+                          </div>
+                        )}
+                      </div>
+                    </>
+                  )}
                 </div>
-              </div>
-              {showRRuleDetails && (
-                <div id="schedule_details" className="row">
-                  <strong>{t("schedule.rrulestring")}:</strong>
-                  <span>{schedule.rrule}</span>
-                  <small>{t("schedule.rrulestring-z-ignored")}</small>
-                  <div className="mt-2">
-                    <strong>{t("schedule.next-occurrences")}:</strong>
-                    {getNextOccurrences(schedule.rruleObject).map(
-                      (occurrence) => (
-                        <div key={occurrence.key}>{occurrence.text}</div>
-                      )
-                    )}
+                {displayRepeat(schedule) && (
+                  <div className="card-footer">
+                    <div id="schedule_details" className="row">
+                      <div className="mb-2">
+                        <strong>{t("schedule.next-occurrences")}:</strong>
+                        {getNextOccurrences(schedule.rruleObject, schedule.duration, schedule.count ? Math.min(schedule.count, 5) : 5).map(
+                          (occurrence) => (<div key={occurrence.key}>
+                            <span>{occurrence.text} </span>
+                            <span className="ms-2 me-2"> - </span>
+                            <span>{occurrence.end}</span>
+                          </div>)
+                        )}
+                      </div>
+                    </div>
+                    <small>
+                      {t('schedule.repetition')}: <span
+                      style={{fontStyle: 'italic'}}>{schedule.rruleObject.toText()}</span>
+                    </small>
                   </div>
-                </div>
-              )}
+                )}
+              </div>
             </div>
           </div>
         ))}
diff --git a/src/components/util/tooltip.jsx b/src/components/util/tooltip.jsx
new file mode 100644
index 00000000..8c2ecbac
--- /dev/null
+++ b/src/components/util/tooltip.jsx
@@ -0,0 +1,19 @@
+import {FontAwesomeIcon} from "@fortawesome/react-fontawesome";
+import {faQuestionCircle} from "@fortawesome/free-solid-svg-icons";
+import {Tooltip as ReactTooltip} from "react-tooltip";
+import {React} from "react";
+
+function Tooltip({ id, content }) {
+  return <>
+    <a data-tooltip-id={id} className="ms-1 me-1">
+      <FontAwesomeIcon icon={faQuestionCircle} className="text-secondary"/>
+    </a>
+    <ReactTooltip
+      id={id}
+      openOnClick={true}
+      content={content}
+    />
+  </>;
+}
+
+export default Tooltip;
diff --git a/src/translations/da/common.json b/src/translations/da/common.json
index e3b0b5b9..406f1720 100644
--- a/src/translations/da/common.json
+++ b/src/translations/da/common.json
@@ -747,7 +747,7 @@
     "byweekno": "Ugenummer",
     "bymonth": "Valgte måneder",
     "byweekday": "Valgte ugedage",
-    "freq": "Frekvens",
+    "freq": "Gentag",
     "show-details": "Vis detaljer",
     "hide-details": "Skjul detaljer",
     "jan": "Januar",
@@ -769,22 +769,40 @@
     "friday": "Fredag",
     "saturday": "Lørdag",
     "sunday": "Søndag",
-    "yearly": "År",
-    "monthly": "Måned",
-    "weekly": "Uge",
-    "daily": "Dag",
+    "yearly": "Hvert år",
+    "monthly": "Hver måned",
+    "weekly": "Hver uge",
+    "daily": "Hver dag",
     "hourly": "Time",
     "minutely": "Minut",
     "rrulestring": "RRule",
-    "rrulestring-z-ignored": "Bemærk at tidszonen (Z) bliver ignoreret i evalueringen af reglen. Tidsangivelserne vil altid blive behandlet i lokal tid.",
-    "dtstart": "Startdato",
-    "until": "Slutdato",
-    "next-occurrences": "Næste 5 forekomster",
+    "dtstart": "Start",
+    "until": "Gentag indtil",
+    "next-occurrences": "Næste forekomster",
     "all-selected": "Alle er valgt",
     "clear-selection": "Ryd valg",
     "selected-all": "Vælg alle",
     "select-some-options": "Vælg...",
-    "bytime": "Tidspunkt på dagen"
+    "bytime": "Tidspunkt på dagen",
+    "duration-error": "Slut kan ikke være før start",
+    "end": "Slut",
+    "count": "Antal gentagelser",
+    "count-placeholder": "Ubegrænset",
+    "interval": "Interval",
+    "repetition": "RRule",
+    "enable-repeat": "Gentag planlægning",
+    "enable-repeat-tooltip": "Når gentagelse aktiveres bestemmer reglerne man vælger, hvornår spillelisten bliver vist.",
+    "end-tooltip": "Forskellen imellem start og slut definerer længden på en gentagelse.",
+    "dtstart-tooltip": "Start definerer tidspunkt på dagen og første mulige dato for gentagelserne, hvis dette aktiveres.",
+    "frequency-tooltip": "Hvordan planlægningen skal gentages?",
+    "interval-tooltip": "Skal der være spring imellem gentagelse? Afhænger af frekvensen. F.eks. hver 3 dag.",
+    "count-tooltip": "Hvor mange gange skal planlægningen gentages? Tom værdi betyder ubegrænset.",
+    "bytime-tooltip": "På hvilke dage skal reglen gælde?",
+    "byweekday-tooltip": "På hvilke dage skal reglen gælde?",
+    "bymonth-tooltip": "I hvilke månender skal reglen gælde?",
+    "byweekno-tooltip": "Hvilket ugenummer skal reglen gælde for?",
+    "until-tooltip": "Hvornår skal gentagelserne afsluttes? Dette tidspunkt påvirker starttidspunktet på en gentagelse, ikke sluttidspunktet.",
+    "helptext": "Når minimum én planlægning er tilføjet, bliver spillelisten kun vist i planlægningsintervallet."
   },
   "duration": {
     "hours": "t.",
diff --git a/yarn.lock b/yarn.lock
index ad5d1b75..6da137f3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -457,6 +457,13 @@
   dependencies:
     "@floating-ui/utils" "^0.2.0"
 
+"@floating-ui/core@^1.6.0":
+  version "1.6.7"
+  resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.6.7.tgz#7602367795a390ff0662efd1c7ae8ca74e75fb12"
+  integrity sha512-yDzVT/Lm101nQ5TCVeK65LtdN7Tj4Qpr9RTXJ2vPFLqtLxwOrpoxAHAJI8J3yYWUc40J0BDBheaitK5SJmno2g==
+  dependencies:
+    "@floating-ui/utils" "^0.2.7"
+
 "@floating-ui/dom@^1.0.1":
   version "1.6.5"
   resolved "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.5.tgz"
@@ -465,11 +472,24 @@
     "@floating-ui/core" "^1.0.0"
     "@floating-ui/utils" "^0.2.0"
 
+"@floating-ui/dom@^1.6.1":
+  version "1.6.10"
+  resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.6.10.tgz#b74c32f34a50336c86dcf1f1c845cf3a39e26d6f"
+  integrity sha512-fskgCFv8J8OamCmyun8MfjB1Olfn+uZKjOKZ0vhYF3gRmEUXcGOjxWL8bBr7i4kIuPZ2KD2S3EUIOxnjC8kl2A==
+  dependencies:
+    "@floating-ui/core" "^1.6.0"
+    "@floating-ui/utils" "^0.2.7"
+
 "@floating-ui/utils@^0.2.0":
   version "0.2.2"
   resolved "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.2.tgz"
   integrity sha512-J4yDIIthosAsRZ5CPYP/jQvUAQtlZTTD/4suA08/FEnlxqW3sKS9iAhgsa9VYLZ6vDHn/ixJgIqRQPotoBjxIw==
 
+"@floating-ui/utils@^0.2.7":
+  version "0.2.7"
+  resolved "https://registry.yarnpkg.com/@floating-ui/utils/-/utils-0.2.7.tgz#d0ece53ce99ab5a8e37ebdfe5e32452a2bfc073e"
+  integrity sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==
+
 "@foliojs-fork/fontkit@^1.9.1":
   version "1.9.2"
   resolved "https://registry.npmjs.org/@foliojs-fork/fontkit/-/fontkit-1.9.2.tgz"
@@ -1380,7 +1400,7 @@ character-reference-invalid@^1.0.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
-classnames@^2.3.1:
+classnames@^2.3.0, classnames@^2.3.1:
   version "2.5.1"
   resolved "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz"
   integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
@@ -4237,6 +4257,14 @@ react-toastify@^10.0.0:
   dependencies:
     clsx "^2.1.0"
 
+react-tooltip@^5.28.0:
+  version "5.28.0"
+  resolved "https://registry.yarnpkg.com/react-tooltip/-/react-tooltip-5.28.0.tgz#c7b5343ab2d740a428494a3d8315515af1f26f46"
+  integrity sha512-R5cO3JPPXk6FRbBHMO0rI9nkUG/JKfalBSQfZedZYzmqaZQgq7GLzF8vcCWx6IhUCKg0yPqJhXIzmIO5ff15xg==
+  dependencies:
+    "@floating-ui/dom" "^1.6.1"
+    classnames "^2.3.0"
+
 react-transition-group@^4.3.0, react-transition-group@^4.4.1:
   version "4.4.5"
   resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz"