diff --git a/css/main.css b/css/main.css
index 5c6717ba..dde2aa62 100644
--- a/css/main.css
+++ b/css/main.css
@@ -294,7 +294,7 @@ Full-Width Styles
 }
 
 #header_wrap .inner {
-  padding: 50px 10px 30px 10px;
+  padding: 40px 10px 10px 10px;
 }
 
 
@@ -340,7 +340,7 @@ img.logo {
 }
 
 #main_content {
-  padding-top: 40px;
+  padding-top: 10px;
 }
 
 img.featured {
@@ -386,6 +386,13 @@ img.featured {
   background: #212121;
 }
 
+#main_content.screenshots img {
+  border: 0;
+  box-shadow: none;
+  padding: 0;
+  margin: 0 0 0 -6px;
+}
+
 .accordion {
   outline: 1px solid;
 }
diff --git a/screenshots/index.html b/screenshots/index.html
index 41cb3148..e22101b9 100644
--- a/screenshots/index.html
+++ b/screenshots/index.html
@@ -6,14 +6,14 @@ layout: default
 Here is how main window of Angry IP Scanner 3.x looks like on various operating systems.
 
 <h3>Linux</h3>
-<img src="ipscan-linux.png">
+<a href="/download/#linux"><img src="ipscan-linux.png"></a>
 
 <h3>Windows 7/Vista</h3>
-<img src="ipscan-vista.png">
+<a href="/download/#windows"><img src="ipscan-vista.png"></a>
 
 <h3>Mac OS X</h3>
-<img src="ipscan-mac.png">
+<a href="/download/#mac"><img src="ipscan-mac.png"></a>
 
 <h3>Windows XP</h3>
 <p>And it even still works on some ancient platforms :-)</p>
-<img src="ipscan-winxp.png">
+<a href="/download/#windows"><img src="ipscan-winxp.png"></a>