diff --git a/frontend/components/autocompleteComponents/autocompleteComponent.tsx b/frontend/components/autocompleteComponents/autocompleteComponent.tsx
index 358d185b..a938044f 100644
--- a/frontend/components/autocompleteComponents/autocompleteComponent.tsx
+++ b/frontend/components/autocompleteComponents/autocompleteComponent.tsx
@@ -109,7 +109,7 @@ const AutocompleteComponent: React.FC<Props> = ({
                 getOptionLabel={(option: any) => option.label || ""}
                 disabled={disabled}
                 renderInput={(params: AutocompleteRenderInputParams) => (
-                    <TextField {...params} variant="outlined" fullWidth style={{ minWidth: "300px" }} />
+                    <TextField {...params} variant="outlined" fullWidth style={{ minWidth: "150px" }} />
                 )}
                 ListboxProps={{ style: { maxHeight: 200, overflowY: "auto" } }}
             />
diff --git a/frontend/pages/admin/analysis/tour.tsx b/frontend/pages/admin/analysis/tour.tsx
index a4eb5b95..cb7c6190 100644
--- a/frontend/pages/admin/analysis/tour.tsx
+++ b/frontend/pages/admin/analysis/tour.tsx
@@ -420,41 +420,39 @@ function AdminTour() {
             <AdminHeader />
             <Container>
                 <Row style={{ display: "flex", alignItems: "center", padding: "10px" }}>
-                    <div style={{ display: "flex" }}>
-                        <div style={{ marginRight: "20px" }}>
-                            <label style={{ marginBottom: "10px" }} htmlFor="tourautocomplete">
-                                Selecteer student
-                            </label>
-                            <TourUserAutocomplete initialId={selectedStudentId} setObjectId={setSelectedStudentId} />
-                        </div>
-                        <div style={{ marginRight: "20px" }}>
-                            <label style={{ marginBottom: "10px" }} htmlFor="tourautocomplete">
-                                Selecteer ronde
-                            </label>
-                            <StudentOnTourAutocomplete
-                                initialId={selectedTourId}
-                                setObjectId={setSelectedTourId}
-                                required={false}
-                                studentId={selectedStudentId}
-                                disabled={!validTourUser}
-                            />
-                        </div>
-                        <div>
-                            <label style={{ paddingBottom: "35px" }} htmlFor="datepicker">
-                                Selecteer datum
-                            </label>
-                            <ReactDatePicker
-                                className="custom-datepicker"
-                                selected={selectedDate}
-                                onChange={(date: Date) => setSelectedDate(date)}
-                                highlightDates={validDates} // highlight valid dates
-                                filterDate={(date: Date) =>
-                                    validDates.map((d) => d.toLocaleDateString()).includes(date.toLocaleDateString())
-                                }
-                                disabled={!validTourUser}
-                            />
-                        </div>
-                    </div>
+                    <Col sm={12} md={4}>
+                        <label style={{ marginBottom: "10px" }} htmlFor="tourautocomplete">
+                            Selecteer student
+                        </label>
+                        <TourUserAutocomplete initialId={selectedStudentId} setObjectId={setSelectedStudentId} />
+                    </Col>
+                    <Col sm={12} md={4}>
+                        <label style={{ marginBottom: "10px" }} htmlFor="tourautocomplete">
+                            Selecteer ronde
+                        </label>
+                        <StudentOnTourAutocomplete
+                            initialId={selectedTourId}
+                            setObjectId={setSelectedTourId}
+                            required={false}
+                            studentId={selectedStudentId}
+                            disabled={!validTourUser}
+                        />
+                    </Col>
+                    <Col sm={12} md={4}>
+                        <label style={{ paddingBottom: "35px" }} htmlFor="datepicker">
+                            Selecteer datum
+                        </label>
+                        <ReactDatePicker
+                            className="custom-datepicker"
+                            selected={selectedDate}
+                            onChange={(date: Date) => setSelectedDate(date)}
+                            highlightDates={validDates} // highlight valid dates
+                            filterDate={(date: Date) =>
+                                validDates.map((d) => d.toLocaleDateString()).includes(date.toLocaleDateString())
+                            }
+                            disabled={!validTourUser}
+                        />
+                    </Col>
                 </Row>
                 <Card>
                     <ErrorMessageAlert setErrorMessages={setErrorMessages} errorMessages={errorMessages} />
@@ -496,7 +494,7 @@ function AdminTour() {
                             <Col xs={12} md={9}>
                                 <p className="title" />
                                 <div className="padding">
-                                    <Table className="table">
+                                    <Table responsive className="table">
                                         <thead>
                                             <tr>
                                                 <th>Gebouw</th>
diff --git a/frontend/pages/admin/analysis/worked-hours.tsx b/frontend/pages/admin/analysis/worked-hours.tsx
index e27221a6..4dc965be 100644
--- a/frontend/pages/admin/analysis/worked-hours.tsx
+++ b/frontend/pages/admin/analysis/worked-hours.tsx
@@ -1,8 +1,8 @@
 import AdminHeader from "@/components/header/adminHeader";
 import React, { useEffect, useState } from "react";
-import { addDays, differenceInMinutes, startOfWeek, subDays, subMonths } from "date-fns";
+import { differenceInMinutes, startOfWeek, subMonths } from "date-fns";
 import { Card, Col, Container, Form, ListGroup, Row } from "react-bootstrap";
-import { datesEqual, formatDate } from "@/lib/date";
+import { datesEqual } from "@/lib/date";
 import { getWorkedHours } from "@/lib/analysis";
 import { getAllTours, Tour } from "@/lib/tour";
 import { getAllRegions, RegionInterface } from "@/lib/region";
@@ -180,15 +180,6 @@ function AdminAnalysisWorkingHours() {
                     <Card>
                         <Form className="m-2">
                             <Row>
-                                <Form.Group as={Col} sm={12} md={3} lg={3}>
-                                    <Form.Label>Periode:</Form.Label>
-                                    <LocaleDateRangePicker
-                                        startDate={startDate}
-                                        setStartDate={setStartDate}
-                                        endDate={endDate}
-                                        setEndDate={setEndDate}
-                                    />
-                                </Form.Group>
                                 <Form.Group as={Col} sm={12} md={3} lg={3}>
                                     <Form.Label>Sorteer op:</Form.Label>
                                     <Select
@@ -239,6 +230,17 @@ function AdminAnalysisWorkingHours() {
                                         menuPortalTarget={document.querySelector("body")}
                                     />
                                 </Form.Group>
+                                <Form.Group as={Col} sm={12} md={3} lg={3}>
+                                    <Form.Label>Periode:</Form.Label>
+                                    <div style={{ maxWidth: "150px" }}>
+                                        <LocaleDateRangePicker
+                                            startDate={startDate}
+                                            setStartDate={setStartDate}
+                                            endDate={endDate}
+                                            setEndDate={setEndDate}
+                                        />
+                                    </div>
+                                </Form.Group>
                             </Row>
                         </Form>
                     </Card>
diff --git a/frontend/pages/admin/communication.tsx b/frontend/pages/admin/communication.tsx
index 72f7165f..0b209795 100644
--- a/frontend/pages/admin/communication.tsx
+++ b/frontend/pages/admin/communication.tsx
@@ -133,50 +133,56 @@ function AdminCommunication() {
             <Container>
                 <p className="title">Communicatie extern</p>
                 <div>
-                    <Row>
-                        <Col md={3}>
-                            <Row>
+                    <Row style={{ paddingBottom: "20px" }}>
+                        <Col sm={12} md={4}>
+                            <div>
                                 <TemplateAutocomplete
                                     initialId={templateId}
                                     setObjectId={setTemplateId}
                                     required={false}
                                 />
-                            </Row>
-                            <Row>
+                            </div>
+                        </Col>
+                        <Col sm={12} md={4}>
+                            <div>
                                 <UserAutoComplete initialId={userId} setObjectId={setUserId} required={false} />
-                            </Row>
-                            <Row>
-                                <div className="padding">
-                                    <Button
-                                        className="small_button"
-                                        size="sm"
-                                        onClick={() => {
-                                            if (userId) {
-                                                routeToBuildings(userId).then();
-                                            }
-                                        }}
-                                    >
-                                        Gebouw
-                                    </Button>
-                                </div>
-                            </Row>
+                            </div>
                         </Col>
-                        <Col md={9}>
+                        <Col style={{ display: "flex", alignItems: "end", justifyContent: "end" }}>
+                            <div className="padding">
+                                <Button
+                                    style={{ height: "50px" }}
+                                    className="button"
+                                    onClick={() => {
+                                        if (userId) {
+                                            routeToBuildings(userId).then();
+                                        }
+                                    }}
+                                >
+                                    Gebouw
+                                </Button>
+                            </div>
+                        </Col>
+                    </Row>
+                    <Row>
+                        <Col>
                             <Row>
-                                <div style={{ display: "flex" }}>
-                                    <Form.Control
-                                        as="textarea"
-                                        className="mail_area"
-                                        placeholder="Schrijf je email hier"
-                                        value={updatedTemplateText}
-                                        onChange={handleEditTemplate}
-                                    />
-                                </div>
+                                <Col>
+                                    <div className="input-field">
+                                        <Form.Control
+                                            as="textarea"
+                                            className="mail_area"
+                                            placeholder="Schrijf je email hier"
+                                            value={updatedTemplateText}
+                                            onChange={handleEditTemplate}
+                                        />
+                                    </div>
+                                </Col>
                             </Row>
                         </Col>
                     </Row>
                     <Row>
-                        <Col md={{ span: 3, offset: 3 }}>
+                        <Col>
                             <div className="padding mt-auto">
                                 <Button
                                     href={`mailto:${getSelectedUserMail()}?body=${encodeURIComponent(
diff --git a/frontend/pages/admin/dashboard.tsx b/frontend/pages/admin/dashboard.tsx
index d7f2f980..ab51c79c 100644
--- a/frontend/pages/admin/dashboard.tsx
+++ b/frontend/pages/admin/dashboard.tsx
@@ -19,7 +19,6 @@ import { getAllRemarksOfStudentOnTour } from "@/lib/remark-at-building";
 import Box from "@mui/material/Box";
 import CheckIcon from "@mui/icons-material/Check";
 import { handleError } from "@/lib/error";
-import CheckCircleOutlineIcon from "@mui/icons-material/CheckCircleOutline";
 import ErrorMessageAlert from "@/components/errorMessageAlert";
 import { Divider, Tooltip } from "@mui/material";
 import { Card, Container, Table } from "react-bootstrap";
@@ -296,7 +295,7 @@ function AdminDashboard() {
                                     {completedStudentOnTours.length > 0 ? (
                                         <>
                                             <label className="subtitle">Voltooid</label>
-                                            <Table responsive className="table">
+                                            <Table responsive className="table"  style={{overflow: 'auto'}}>
                                                 <thead>
                                                     <tr>
                                                         <th>Ronde</th>
@@ -359,7 +358,7 @@ function AdminDashboard() {
                                     {startedStudentOnTours.length > 0 ? (
                                         <>
                                             <label className="subtitle">Bezig</label>
-                                            <Table className="table">
+                                            <Table responsive className="table">
                                                 <thead>
                                                     <tr>
                                                         <th>Ronde</th>
@@ -417,7 +416,7 @@ function AdminDashboard() {
                                     {notYetStartedStudentOnTours.length > 0 ? (
                                         <>
                                             <label className="subtitle">Nog niet gestarte rondes</label>
-                                            <Table className="table">
+                                            <Table responsive className="table">
                                                 <thead>
                                                     <tr>
                                                         <th>Ronde</th>
diff --git a/frontend/pages/admin/data/garbage-collection/index.tsx b/frontend/pages/admin/data/garbage-collection/index.tsx
index c988cf9d..b627f422 100644
--- a/frontend/pages/admin/data/garbage-collection/index.tsx
+++ b/frontend/pages/admin/data/garbage-collection/index.tsx
@@ -461,8 +461,8 @@ function GarbageCollectionSchedule() {
                         </Col>
                         <Col md={6} style={{ alignItems: "center" }}>
                             <Row>
-                                <Col md={5}>
-                                    <div style={{ display: "flex" }}>
+                                <Col md={6}>
+                                    <div>
                                         <BuildingAutocomplete
                                             initialId={0}
                                             setObjectId={setSearchedBuilding}
@@ -470,7 +470,7 @@ function GarbageCollectionSchedule() {
                                         />
                                     </div>
                                 </Col>
-                                <Col md={5}>
+                                <Col md={6}>
                                     <div>
                                         <TourAutocomplete initialId={0} setObjectId={setSearchedTour} />
                                     </div>