diff --git a/index.html b/index.html
index 098a226..bf2da32 100755
--- a/index.html
+++ b/index.html
@@ -739,6 +739,37 @@ $(document).ready(function(){
 					</p>
 				</div>
 			</div>
+
+			<div class="page vertical-image-fit dark">
+				<div class="content">
+					<img onclick="toggleCaption($(this))" src="img.jpg">
+					<div class="caption hidden" contenteditable="false">
+						Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius.
+					</div>
+					<div class="page-number-text">[PAGE NUMBER]</div>
+				</div>
+			</div>
+
+			<div class="page horizontal-image-fit light">
+				<div class="content">
+					<img onclick="toggleCaption($(this))" src="landscape.jpg">
+					<div class="caption hidden" contenteditable="false">
+						Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius.
+					</div>
+					<div class="page-number-text">[PAGE NUMBER]</div>
+				</div>
+			</div>
+
+			<div class="page vertical-image-fit no-resize dark">
+				<div class="content">
+					<img onclick="toggleCaption($(this))" src="img.jpg">
+					<div class="caption hidden" contenteditable="false">
+						Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius.
+					</div>
+					<div class="page-number-text">[PAGE NUMBER]</div>
+				</div>
+			</div>
+
 		</div>
 		<!--div class="article vertical">
 			<div class="cover page">
diff --git a/landscape.jpg b/landscape.jpg
new file mode 100755
index 0000000..ea6b287
Binary files /dev/null and b/landscape.jpg differ
diff --git a/layout.js b/layout.js
index dd1c6bd..ac315e0 100755
--- a/layout.js
+++ b/layout.js
@@ -72,6 +72,11 @@ var togglePageView = createCSSClassToggler(
 var toggleInlineEditorMode = createCSSClassToggler('.chrome', 'inline-editor-mode')
 
 
+function toggleCaption(img){
+	img.parent().find('.caption').toggleClass('hidden')
+}
+
+
 
 /************************************************** event handlers ***/
 
diff --git a/magazine.css b/magazine.css
index fbab939..7bd5b4a 100755
--- a/magazine.css
+++ b/magazine.css
@@ -582,15 +582,22 @@ div.page-number-text {
 .caption {
 	display: block;
 	position: absolute;
-	height: 100px;
+	height: auto;
+	min-height: 100px;
 	width: 100%;
 	bottom: 0px;
 	left: 0px;
 
+	box-sizing: border-box;
+
 	padding: 15px;
+	padding-bottom: 30px;
+
 	color: white;
 	background: black;
-	opacity: 0.5;
+
+	opacity: 0.8;
+
 	-webkit-transition: all 0.2s ease;
 	-moz-transition: all 0.2s ease;
 	-o-transition: all 0.2s ease;
@@ -774,6 +781,34 @@ div.page-number-text {
 }
 
 
+.page.vertical-image-fit,
+.page.horizontal-image-fit {
+	/* prevent link errors from messing up the mag layout... */
+	overflow: hidden;
+}
+
+.page.vertical-image-fit .content {
+	width: auto;
+}
+.page.vertical-image-fit .content img {
+	height: 100%;
+	cursor: hand;
+}
+
+.page.horizontal-image-fit .content {
+	display: table-cell;
+	vertical-align: middle;
+}
+.page.horizontal-image-fit .content img {
+	width: 100%;
+	cursor: hand;
+}
+
+.page.horizontal-image-fit .caption,
+.page.vertical-image-fit .caption {
+}
+
+
 
 /*********************************************************************/