diff --git a/templates/view_question.html b/templates/view_question.html
index 06917a1..02256a7 100644
--- a/templates/view_question.html
+++ b/templates/view_question.html
@@ -6,121 +6,27 @@
 {% block content %}
 <div class="row">
 	<div class="col-sm-8 m-auto">
-		{# <div class="card mt-3 mb-3" id="question-{{ question.id }}">
-			<div class="position-relative">
-				<div class="card-header">
-					<div class="d-flex justify-content-between align-items-center flex-wrap text-break">
-						<h3 class="h5 card-title mt-1 mb-1 markdown-content">
-							{% if question.from_who %}
-							{{ question.from_who | render_markdown }}
-							{% else %}
-							<i class="bi bi-incognito" data-bs-toggle="tooltip" data-bs-title="This question was asked anonymously" data-bs-placement="top"></i> {{ cfg.anonName }}
-							{% endif %}
-						</h3>
-						<h3 class="h6 card-subtitle fw-light text-body-secondary" data-bs-toggle="tooltip" data-bs-title="{{ question.creation_date.strftime('%B %d, %Y %H:%M') }}" data-bs-placement="top">{{ formatRelativeTime(str(question.creation_date)) }}</h3>
-					</div>
-					{% include 'snippets/q-card-text.html' %}
-				</div>
-			</div>
-			<div class="card-body">
-				{% if answer.cw %}
-				<div class="text-center mb-2 fw-bold cw-text markdown-content">{{ answer.cw | render_markdown }}</div>
-				<div class="collapse question-cw markdown-content" id="answer-cw-{{ answer.id }}">
-					{{ answer.content | render_markdown }}
-				</div>
-				<button class="z-0 cw-btn btn btn-sm btn-secondary shadow text-center w-100 sticky-bottom" type="button" data-bs-toggle="collapse" data-bs-target="#answer-cw-{{ answer.id }}" aria-expanded="false" aria-controls="answer-cw-{{ answer.id }}">
-					<span class="fw-medium cw-btn-text">Show content</span>
-					<span class="text-body-secondary cw-btn-chars">({{ len(answer.content) }} characters)</span>
-				</button>
-				{% else %}
-				<div class="markdown-content">{{ answer.content | render_markdown }}</div>
-				{% endif %}
-			</div>
-			<div class="card-footer pt-0 pb-0 ps-3 pe-1 text-body-secondary d-flex justify-content-between align-items-center">
-				<div>
-					<span class="fs-6" data-bs-toggle="tooltip" data-bs-title="{{ answer.creation_date.strftime("%B %d, %Y %H:%M") }}">{{ formatRelativeTime(str(answer.creation_date)) }}</span>
-				</div>
-				<div class="d-flex align-items-center">
-					<div class="dropdown">
-						<button class="btn btn-basic pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Share question"><i class="bi bi-share"></i></button>
-						<ul class="dropdown-menu">
-							<li><button class="dropdown-item" onclick="copyFull(`{{ trimContent(question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter) }} {{ cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id) }}`)"><i class="bi bi-copy me-1"></i> Copy to clipboard</button></li>
-							<li>
-								<button class="dropdown-item d-flex align-items-center gap-1" data-bs-toggle="modal" data-bs-target="#question-{{ question.id }}-modal">
-									<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 64 64" class="me-1">
-										<path fill="currentColor" d="M12.088 23.868a6.734 6.732 0 0 1-2.88 2.866L25.02 42.602l3.812-1.93Zm20.857 20.93-3.812 1.932 8.012 8.04a6.734 6.732 0 0 1 2.88-2.866z"/>
-										<path fill="currentColor" d="m51.24 30.147-8.952 4.535.66 4.22 10.128-5.131a6.734 6.732 0 0 1-1.837-3.624Zm-14.15 7.168L15.926 48.038a6.734 6.732 0 0 1 1.837 3.624l19.989-10.127z"/>
-										<path fill="currentColor" d="M30.284 10.9 20.071 30.833l3.016 3.027L33.9 12.755a6.734 6.732 0 0 1-3.616-1.854zm-12.87 25.117-5.172 10.095a6.734 6.732 0 0 1 3.615 1.855l4.573-8.925z"/>
-										<path fill="currentColor" d="M9.12 26.778a6.734 6.732 0 0 1-3.364.703 6.734 6.732 0 0 1-.65-.068l3.02 19.316a6.734 6.732 0 0 1 3.365-.703 6.734 6.732 0 0 1 .65.068z"/>
-										<path fill="currentColor" d="M17.779 51.758a6.734 6.732 0 0 1 .07 1.356 6.734 6.732 0 0 1-.71 2.656l19.318 3.099a6.734 6.732 0 0 1-.07-1.356 6.734 6.732 0 0 1 .71-2.656Z"/>
-										<path fill="currentColor" d="m53.144 33.841-8.917 17.402a6.734 6.732 0 0 1 3.617 1.855l8.916-17.402a6.734 6.732 0 0 1-3.616-1.855z"/>
-										<path fill="currentColor" d="M40.983 9.229a6.734 6.732 0 0 1-2.88 2.866L51.91 25.953a6.734 6.732 0 0 1 2.88-2.867z"/>
-										<path fill="currentColor" d="M28.38 7.206 10.922 16.05a6.734 6.732 0 0 1 1.837 3.624l17.456-8.844a6.734 6.732 0 0 1-1.837-3.624Z"/>
-										<path fill="currentColor" d="M38.07 12.111a6.734 6.732 0 0 1-3.42.731 6.734 6.732 0 0 1-.589-.062l1.546 9.898 4.22.677zm-1.564 16.322 3.656 23.402a6.734 6.732 0 0 1 3.315-.678 6.734 6.732 0 0 1 .705.077L40.726 29.11Z"/>
-										<path fill="currentColor" d="M12.772 19.748a6.734 6.732 0 0 1 .075 1.377 6.734 6.732 0 0 1-.7 2.637l9.909 1.59 1.947-3.801zm16.984 2.726-1.948 3.803 23.413 3.759a6.734 6.732 0 0 1-.068-1.341 6.734 6.732 0 0 1 .718-2.67z"/>
-										<circle fill="currentColor" cx="35.017" cy="6.12" r="6.12"/>
-										<circle fill="currentColor" cx="57.878" cy="29.062" r="6.12"/>
-										<circle fill="currentColor" cx="43.111" cy="57.88" r="6.12"/>
-										<circle fill="currentColor" cx="11.124" cy="52.749" r="6.12"/>
-										<circle fill="currentColor" cx="6.122" cy="20.759" r="6.12"/>
-									</svg>
-									Share on Fediverse
-								</button>
-							</li>
-							<li><a class="dropdown-item" target="_blank" href="https://twitter.com/intent/tweet?text={{ urllib.parse.quote(trimContent(question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id), safe='') }}"><i class="bi bi-twitter me-1"></i> Share on Twitter</a></li>
-							<li>
-								<a class="dropdown-item d-flex align-items-center gap-1" target="_blank" href="https://bsky.app/intent/compose?text={{ urllib.parse.quote(trimContent(question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id), safe='') }}">
-									<svg width="16" height="16" class="me-1" viewBox="0 0 568 501" fill="none" xmlns="http://www.w3.org/2000/svg">
-										<path fill="currentColor" d="M123.121 33.6637C188.241 82.5526 258.281 181.681 284 234.873C309.719 181.681 379.759 82.5526 444.879 33.6637C491.866 -1.61183 568 -28.9064 568 57.9464C568 75.2916 558.055 203.659 552.222 224.501C531.947 296.954 458.067 315.434 392.347 304.249C507.222 323.8 536.444 388.56 473.333 453.32C353.473 576.312 301.061 422.461 287.631 383.039C285.169 375.812 284.017 372.431 284 375.306C283.983 372.431 282.831 375.812 280.369 383.039C266.939 422.461 214.527 576.312 94.6667 453.32C31.5556 388.56 60.7778 323.8 175.653 304.249C109.933 315.434 36.0535 296.954 15.7778 224.501C9.94525 203.659 0 75.2916 0 57.9464C0 -28.9064 76.1345 -1.61183 123.121 33.6637Z" fill="black"/>
-									</svg>
-									Share on Bluesky
-								</a>
-							</li>
-							<li>
-								<a class="dropdown-item d-flex align-items-center gap-1" target="_blank" href="https://www.tumblr.com/widgets/share/tool?shareSource=legacy&posttype=text&title={{ urllib.parse.quote(trimContent(question.content, cfg.trimContentAfter), safe='') }}&url={{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id), safe='') }}&caption=&content={{ urllib.parse.quote(trimContent(answer.content, cfg.trimContentAfter),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id), safe='') }}">
-									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" width="16" height="16" class="me-1">
-										<path d="M6.27051 7.62976C8.86829 7.07312 10.816 4.76401 10.816 2H13.8463V7.15152H17.4826V10.7879H13.8463V16.2424C13.8463 16.7566 14.044 17.4493 14.7554 17.9091C15.2296 18.2156 16.2397 18.3671 17.7857 18.3636V22H13.5432C11.0329 22 8.99778 19.9649 8.99778 17.4545V10.7879H6.27051V7.62976Z"></path>
-									</svg>
-									Share on Tumblr
-								</a>
-							</li>
-							<li class="d-block d-lg-none"><button class="dropdown-item nativeShareBtn" onclick="nativeShare(`{{ trimContent(question.content, cfg.trimContentAfter) }}`, `{{ trimContent(answer.content, cfg.trimContentAfter) }}`, `{{ cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=question.id) }}`)"><i class="bi bi-share me-1"></i> Share on other apps...</button>
-						</ul>
-					</div>
-					<div class="dropdown">
-						<button class="btn btn-basic pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Miscellaneous menu"><i class="bi bi-three-dots"></i></button>
-						<ul class="dropdown-menu">
-							<li><button class="dropdown-item" onclick="copy({{ question.id }})"><i class="bi bi-copy me-1"></i> Copy link</button></li>
-							{% if logged_in %}
-							<li><button class="dropdown-item" hx-post="{{ url_for('api.unpinQuestion', question_id=question.id) }}" hx-target="#top-response-container" hx-swap="none"><i class="bi bi-pin-angle me-1"></i> Unpin</button></li>
-							<li><button class="bg-hover-danger text-danger dropdown-item" hx-post="{{ url_for('api.returnToInbox', question_id=question.id) }}" hx-target="#top-response-container" hx-swap="none" data-deletetarget data-target="question-{{ question.id }}"><i class="bi bi-arrow-return-left me-1"></i> Return to inbox</button></li>
-							{% endif %}
-						</ul>
-					</div>
-				</div>
-			</div>
-		</div> #}
-		{% with answers=answer %}
+		{% with answers=answer, noManageBtns=True %}
 		{% include 'snippets/layout/question_card.html' %}
 		{% endwith %}
 	</div>
 </div>
-<div class="modal fade" id="question-{{ question.id }}-modal" tabindex="-1" aria-labelledby="q-{{ question.id }}-modal-label" aria-hidden="true">
+<div class="modal fade" id="question-modal" tabindex="-1" aria-labelledby="q-modal-label" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered">
 		<div class="modal-content">
-			<div class="modal-header">
-				<h1 class="modal-title fs-5" id="q-{{ question.id }}-modal-label">Share on Fediverse</h1>
-				<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+			<div class="modal-header border-0">
+				<h1 class="modal-title fs-5 fw-normal" id="q-modal-label">Share on Fediverse</h1>
+				<button type="button" class="btn-close d-flex align-items-center fs-5" data-bs-dismiss="modal" aria-label="Close"><i class="bi bi-x-lg"></i></button>
 			</div>
-			<div class="modal-body">
+			<div class="modal-body py-0">
 				<div class="form-group mb-3">
-					<label for="fediInstance">Fediverse instance domain:</label>
-					<input type="text" id="fediInstance-{{question.id}}" name="fediInstance" class="form-control">
+					<label for="fediInstance" class="form-label">Fediverse instance domain:</label>
+					<input type="text" id="fediInstance" name="fediInstance" class="form-control">
 				</div>
 			</div>
-			<div class="modal-footer">
-				<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
-				<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="shareOnFediverse('{{ question.id }}', `{{ urllib.parse.quote(trimContent(question.content, 30) + ' — ' + trimContent(answer.content, 30),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + '/q/' + str(question.id) + '/',safe='') }}`)">Share</button>
+			<div class="modal-footer pt-1 border-0">
+				<button type="button" class="btn btn-outline-secondary flex-fill flex-lg-grow-0" data-bs-dismiss="modal">Cancel</button>
+				<button type="button" class="btn btn-primary flex-fill flex-lg-grow-0" data-bs-dismiss="modal" id="q-modal-submit">Share</button>
 			</div>
 		</div>
 	</div>
@@ -129,6 +35,34 @@
 {% block scripts %}
 <script src="{{ url_for('static', filename='js/toastify.min.js') }}"></script>
 <script>
+	const questionModal = document.getElementById('question-modal');
+	questionModal.addEventListener('show.bs.modal', event => {
+	    // Button that triggered the modal
+		let button = event.relatedTarget;
+	    // Extract info from data-bs-* attributes
+		let questionId = "{{ question.id }}";
+		let questionContent = document.querySelector(`.question-${questionId}`).innerText;
+		console.log(questionContent);
+		let answerContent = document.getElementById(`a-${questionId}-content`).innerText;
+		console.log(answerContent);
+
+		let submitBtn = document.getElementById('q-modal-submit');
+
+		// Define the cfg variables
+		const trimContentAfter = "{{ cfg.trimContentAfter }}";
+		const instanceFullBaseUrl = "{{ cfg.instance.fullBaseUrl }}";
+
+		let questionText = questionContent.length > trimContentAfter ? questionContent.substring(0, trimContentAfter) + '…' : questionContent;
+		let answerText = answerContent.length > trimContentAfter ? answerContent.substring(0, trimContentAfter) + '…' : answerContent;
+		let questionUrl = `${instanceFullBaseUrl}/q/${questionId}/`;
+
+		let encodedContent = encodeURI(`${questionText} — ${answerText} ${questionUrl}`);
+		// Set up the shareOnFediverse function
+		submitBtn.addEventListener('click', function() {
+			shareOnFediverse(questionId, encodedContent);
+		});
+		console.log(submitBtn);
+	});
     document.addEventListener('DOMContentLoaded', function () {
         const collapseElements = document.querySelectorAll('.collapse.question-cw');
         const toggleButtons = document.querySelectorAll('.cw-btn');
@@ -181,7 +115,7 @@
 		}).showToast();
 	}
 function shareOnFediverse(questionId, contentToShare) {
-    const instanceDomain = document.getElementById(`fediInstance-${questionId}`).value.trim();
+    const instanceDomain = document.getElementById(`fediInstance`).value.trim();
     const shareUrl = `https://${instanceDomain}/share?text=${contentToShare}`;
     
    	window.open(shareUrl, '_blank');