diff --git a/public_html/media/css/core.css b/public_html/media/css/core.css
index 58bfb520..e587f43e 100644
--- a/public_html/media/css/core.css
+++ b/public_html/media/css/core.css
@@ -260,12 +260,12 @@ button {
 	box-sizing: border-box !important;
 	vertical-align: middle;
 	line-height: 24px;
-	height: 34px;
+	padding: 3px 5px;
+	height: 30px;
 }
 label,
 input,
 select {
-	padding: 5px;
 	font-family: inherit;
 	font-size: 11pt;
 }
@@ -296,7 +296,7 @@ button:hover {
 }
 
 .form-row {
-	margin: 0.25em 0;
+	margin: 0 0 0.5em 0;
 	clear: left;
 }
 .input-wrapper {
@@ -319,12 +319,19 @@ ul.tagit {
 	-webkit-box-sizing: border-box;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
+	min-height: 32px;
+}
+ul.tagit li.tagit-new {
+	padding: 1px 0 !important;
+}
+ul.tagit li.tagit-choice {
+	padding: 1px 20px 1px 5px !important;
 }
 ul.tagit input {
 	border: 0 !important;
 	line-height: auto !important;
 	height: auto !important;
-	margin: -4px 0 !important;
+	padding: 0 !important;
 }
 .related-tags {
 	padding: 0.5em;
diff --git a/public_html/media/css/post-upload.css b/public_html/media/css/post-upload.css
index 61f6ecfe..64446bd7 100644
--- a/public_html/media/css/post-upload.css
+++ b/public_html/media/css/post-upload.css
@@ -74,7 +74,7 @@
 
 .post .ops a {
 	cursor: pointer;
-	margin-left: 0.5em;
+	margin-left: 1.5em;
 	vertical-align: middle;
 }
 .post a span {
@@ -117,11 +117,11 @@
 .post .file-name strong {
 	overflow: hidden;
 	text-overflow: ellipsis;
-	max-width: 50%;
+	max-width: 100%;
 	white-space: pre;
 	display: inline-block;
-	vertical-align: middle;
-	padding: 0.5em 0;
+	vertical-align: text-bottom;
+	line-height: 30px;
 }
 
 .safety-safe {
@@ -155,6 +155,9 @@ ul.tagit {
 .post .form-wrapper {
 	overflow: hidden;
 }
+.post form {
+	margin-top: 0;
+}
 
 #lightbox {
 	display: none;
diff --git a/src/Views/post/post-upload.phtml b/src/Views/post/post-upload.phtml
index aefa2b04..6c0e55be 100644
--- a/src/Views/post/post-upload.phtml
+++ b/src/Views/post/post-upload.phtml
@@ -71,7 +71,9 @@ $this->assets->addScript('../lib/tagit/jquery.tagit.js');
 			<form action="<?= \Chibi\Router::linkTo(['PostController', 'uploadAction']) ?>" method="post">
 				<div class="form-row file-name">
 					<label>File:</label>
-					<strong>filename.jpg</strong>
+					<div class="input-wrapper">
+						<strong>filename.jpg</strong>
+					</div>
 				</div>
 
 				<div class="form-row safety">