diff --git a/src/examples.ts b/src/examples.ts
index 7d3663d..b8689d6 100644
--- a/src/examples.ts
+++ b/src/examples.ts
@@ -97,12 +97,11 @@ export const examples = [
     text: 'grafana settings api w/ template',
     config: {
       mode: RenderMode.template,
+      // tslint:disable-next-line
       template:
-        '<h2>Instance: {{ response.DEFAULT.instance_name }}</h2>\n\n' +
-        '<div ng-repeat="(key, value) in response">\n\n        ' +
-        '<h5>{{key}}</h5>\n\n        ' +
-        '<pre>{{ value | json }}</pre>\n\n      ' +
-        '</div>',
+        // tslint:disable-next-line: max-line-length
+        '<h2>Instance: {{ response.DEFAULT.instance_name }}</h2>\n\n<div ng-repeat="(key, value) in response">\n\n        <h5>{{key}}</h5>\n\n        <pre>{{ value | json }}</pre>\n\n      </div>',
+
       url: '/api/admin/settings',
       params_js: '{}',
     },
diff --git a/src/module.ts b/src/module.ts
index 2742836..72bb309 100644
--- a/src/module.ts
+++ b/src/module.ts
@@ -554,6 +554,15 @@ class AjaxCtrl extends MetricsPanelCtrl {
   openFullscreen() {
     // Update the image
     this.overlay.find('img').attr('src', this.objectURL);
+
+    if (this.panel.fitImageToScreen) {
+      this.overlay.find('img').css('max-width', '98vw');
+      this.overlay.find('img').css('max-height', '98vh');
+    } else {
+      this.overlay.find('img').css('max-width', '');
+      this.overlay.find('img').css('max-height', '');
+    }
+
     $('.grafana-app').append(this.overlay);
     this.overlay.on('click', () => {
       this.overlay.remove();
diff --git a/src/partials/editor.display.html b/src/partials/editor.display.html
index 968b786..b3b3b84 100644
--- a/src/partials/editor.display.html
+++ b/src/partials/editor.display.html
@@ -11,7 +11,13 @@ <h5 class="section-heading">Display</h5>
 				</select>
 			</div>
 
-			<div ng-if="!ctrl.isIframe" class="gf-form-select-wrapper width-12">
+			<div ng-if="ctrl.img" class="gf-form-select-wrapper width-12">
+				<select class="gf-form-input" value="image">
+					<option value="image">Image</option>
+				</select>
+			</div> 
+
+			<div ng-if="!ctrl.isIframe && !ctrl.img" class="gf-form-select-wrapper width-12">
 				<select class="gf-form-input" ng-model="ctrl.panel.mode" ng-change="ctrl.updateTemplate()">
 				   <option value="html">Direct HTML</option>
 				   <option value="text">Escaped Text</option>	
@@ -58,6 +64,14 @@ <h5 class="section-heading">Time</h5>
 	</div>
 </div>
 
+<div class="editor-row" ng-if="ctrl.panel.mode === 'image'">
+	<h5 class="section-heading">Image</h5>
+
+		<gf-form-switch class="gf-form" label="Fit to screen" label-class="width-12"
+			checked="ctrl.panel.fitImageToScreen"
+			on-change="ctrl.onConfigChanged()"></gf-form-switch>
+</div>
+
 <div class="editor-row" ng-if="ctrl.panel.mode === 'template'">
 	<h5 class="section-heading">Angular Template</h5>