diff --git a/website/base.css b/website/base.css
index 1030556f..d3588b8d 100644
--- a/website/base.css
+++ b/website/base.css
@@ -126,10 +126,7 @@ table.reference.cli > * > * > td:first-child {
 	background-repeat: no-repeat;
 	border: 1px solid #a2a2a2;
 	border-radius: 7px;
-	-moz-border-radius: 7px;
-	-webkit-border-radius: 7px;
 	box-shadow: 0px 2px 5px #a2a2a2;
-	-moz-box-shadow: 0px 2px 5px #a2a2a2;
 	overflow: visible;
 }
 
@@ -199,7 +196,17 @@ h1 .description {
 	background-color: #E6E6E6;
 	border: 1px solid lightgray;
 	box-shadow: 0px 2px 5px #a2a2a2;
-	-moz-box-shadow: 0px 2px 5px #a2a2a2;
+}
+
+.main-section-screenshot {
+	float: right;
+	margin-top: 30px;
+	margin-left: 20px;
+	margin-right: 5px;
+}
+
+.main-section-screenshot img {
+	box-shadow: 0px 2px 5px #a2a2a2;
 }
 
 .screenshot a {
@@ -240,22 +247,6 @@ div.screencast:hover .play {
 	text-align: center;
 }
 
-.webstart.button {
-	margin: 15px;
-	min-height: 25px;
-	text-align: center;
-}
-
-.webstart.button a img {
-	box-shadow: 0px 0px 5px lightgray;
-	-moz-box-shadow: 0px 0px 5px lightgray;
-}
-
-.webstart.button a:hover img {
-	box-shadow: 0px 1px 8px darkorange;
-	-moz-box-shadow: 0px 1px 8px darkorange;
-}
-
 .section.tutorial ol, .section.tutorial ul {
 	background-color: #EFEFEF;
 	font-family: Verdana, Helvetica, Arial, sans-serif;
diff --git a/website/cli.html b/website/cli.html
index fecddd01..5039fce3 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -76,8 +76,8 @@
 			</div>
 			
 			<div class="content">
-				<div class="screenshot" style="margin-top: 35px; border:none; box-shadow:none; background:white">
-					<a target="_blank" href="screenshots/original/cli.png"><img alt="screenshot" src="screenshots/medium/cli.png" /></a>
+				<div class="main-section-screenshot">
+					<a target="_blank" href="screenshots/original/cli.rename.png"><img alt="screenshot" width="290" src="screenshots/original/cli.rename.png" /></a>
 				</div>
 				<div class="section about">
 					<h2>About</h2>
diff --git a/website/screenshots/medium/cli.png b/website/screenshots/medium/cli.png
deleted file mode 100644
index 9105166e..00000000
Binary files a/website/screenshots/medium/cli.png and /dev/null differ
diff --git a/website/screenshots/original/cli.png b/website/screenshots/original/cli.png
deleted file mode 100644
index 940ca3e0..00000000
Binary files a/website/screenshots/original/cli.png and /dev/null differ
diff --git a/website/screenshots/original/cli.rename.png b/website/screenshots/original/cli.rename.png
new file mode 100644
index 00000000..e9a9b55a
Binary files /dev/null and b/website/screenshots/original/cli.rename.png differ