diff --git a/.env.example b/.env.example
index a028531af..c6a299964 100644
--- a/.env.example
+++ b/.env.example
@@ -10,7 +10,7 @@
 APP_ENV=local
 
 # Encryption key, Re-generate with `php please key:generate`
-APP_KEY=base64:ZZxdn6dbVTL7cpzcmALmsSG0uwa+b07KilEHDweqXyQ=  # Was: ENCRYPTION_KEY
+APP_KEY= # Was: ENCRYPTION_KEY
 
 # Show debugging information when an error occurs
 APP_DEBUG=true
@@ -43,7 +43,7 @@ APP_DEBUG=true
 # figure out how to rewrite urls in the server of your choice.
 
 # This variable is deprecated, since .htaccess/mod_rewrite is mandatory.
-INDEX_PAGE="index.php?"
+#INDEX_PAGE="index.php?"
 
 # URI_PROTOCOL (Deprecated)
 # -------------------------
diff --git a/Dockerfile b/Dockerfile
index 5f78c58fa..b369e972f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,12 +11,25 @@ LABEL architecture="x86_64" \
 	  License="MIT" \
 	  version="v6.0.0-alpha"
 
-RUN arch="$(dpkg --print-architecture)" && args="--with-libdir=lib/x86_64-linux-gnu/" && \
-    case "$arch" in \
-        *arm*) args="" ;; \
-    esac && \
-    docker-php-ext-configure ldap "$args" && \
-    docker-php-ext-install -j$(nproc) curl pdo_mysql soap ldap zip
+#RUN arch="$(dpkg --print-architecture)" && args="--with-libdir=lib/x86_64-linux-gnu/" && \
+#    case "$arch" in \
+#        *arm*) args="" ;; \
+#    esac && \
+#    docker-php-ext-configure ldap "$args" && \
+#    docker-php-ext-install -j$(nproc) curl pdo_mysql soap ldap zip
+
+RUN apt-get update && \
+    apt-get install --no-install-recommends -y libldap2-dev \
+    libcurl4-openssl-dev \
+    libzip-dev \
+    unzip \
+    zlib1g-dev \
+    libxml2-dev && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
+
+RUN docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu/ && \
+    docker-php-ext-install -j$(nproc) curl pdo_mysql soap ldap zip opcache
 
 ENV COMPOSER_ALLOW_SUPERUSER 1
 ENV COMPOSER_HOME /tmp
@@ -31,7 +44,8 @@ COPY --chown=www-data:www-data . $APP_DIR
 COPY --chown=www-data:www-data --from=frontend /usr/src/app/public/ $APACHE_DOCUMENT_ROOT/
 WORKDIR $APP_DIR
 
-COPY --from=composer:2.2.6 /usr/bin/composer /usr/local/bin/composer
+COPY --from=composer:2.6 /usr/bin/composer /usr/local/bin/composer
+COPY build/composer-local.example.json $APP_DIR/composer.local.json
 
 USER www-data
 
@@ -39,7 +53,9 @@ RUN composer install --no-dev && \
     composer dumpautoload -o && \
     composer clear-cache
 
-RUN mkdir -p app/db
+# You should not use this directory for SQLite as Laravel defines one. However, it is provided for backwards compatibility.
+RUN mkdir -p app/db && \
+	touch app/db/db.sqlite
 
 RUN php please migrate
 
diff --git a/public/assets/js/munkireport.comment.js b/public/assets/js/munkireport.comment.js
index a7c04d66b..1eec6eb27 100644
--- a/public/assets/js/munkireport.comment.js
+++ b/public/assets/js/munkireport.comment.js
@@ -129,7 +129,7 @@ $(document).on('appReady', function(e, lang) {
 				data.html = data.html || 'No comments'
 				me.html(data.html)
 					.after($('<button>')
-						.addClass('btn btn-default hidden-print')
+						.addClass('btn btn-default btn-outline-secondary')
 						.data('section', section)
 						.click(addComment)
 						.text('Edit'))
diff --git a/resources/views/layouts/mr.blade.php b/resources/views/layouts/mr.blade.php
index ae75fd4b0..1a4a10537 100644
--- a/resources/views/layouts/mr.blade.php
+++ b/resources/views/layouts/mr.blade.php
@@ -255,8 +255,10 @@
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel"></h4>
+                <h5 class="modal-title" id="myModalLabel"></h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
             </div>
             <div class="modal-body">
                 ...