diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html
index 9cea59a2..bcac6f45 100644
--- a/app/templates/packages/view.html
+++ b/app/templates/packages/view.html
@@ -32,7 +32,7 @@
 {% block download_btn %}
 	{% if release %}
 		<a class="btn btn-block btn-download" rel="nofollow" download="{{ release.getDownloadFileName() }}"
-				href="{{ package.getURL('packages.download') }}">
+				href="{{ release.getDownloadURL() }}">
 			<div>
 				{{ _("Download") }}
 			</div>
@@ -164,7 +164,8 @@
 						</span>
 					</a>
 					{% if release %}
-						<a class="btn" rel="nofollow" href="{{ package.getURL('packages.stats') }}" title="{{ _('Statistics') }}">
+						<a class="btn" rel="nofollow" href="{{ release.getDownloadURL() }}" title="{{ _('Downloads') }}"
+								download="{{ release.getDownloadFileName() }}">
 							<i class="fas fa-download"></i>
 							<span class="count">{{ package.downloads }}</span>
 						</a>
@@ -205,6 +206,10 @@
 							<span class="count">{{ _("Issue Tracker") }}</span>
 						</a>
 					{% endif %}
+					<a class="btn" href="{{ package.getURL('packages.stats') }}">
+						<i class="fas fa-chart-line"></i>
+						<span class="count">{{ _("Statistics") }}</span>
+					</a>
 				</div>
 			</div>
 		</div>
@@ -543,19 +548,16 @@
 				</div>
 
 				<p class="mt-3">
-					<a href="{{ package.getURL('packages.stats') }}">
-						<i class="fas fa-chart-line mr-1"></i>
-						{{ _("Statistics") }}
-					</a>
 					{% if package.approved and current_user != package.author %}
-						|
 						<a href="{{ url_for('report.report', url=url_current()) }}">
 							<i class="fas fa-flag mr-1"></i>
 							{{ _("Report") }}
 						</a>
 					{% endif %}
 					{% if package.checkPerm(current_user, "EDIT_PACKAGE") or package.checkPerm(current_user, "APPROVE_NEW") %}
-						|
+						{% if package.approved and current_user != package.author %}
+							|
+						{% endif %}
 						<a href="{{ package.getURL('packages.audit') }}">
 							{{ _("See audit log") }}
 						</a>