diff --git a/index.html b/index.html
index 7543a50..54ef49b 100644
--- a/index.html
+++ b/index.html
@@ -27,18 +27,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	<link rel="stylesheet" type="text/css" href="uhr-white.css" />
 	<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 </head>
-<body>
+<body style="padding:0;margin:0;">
 	<div id="uhr"></div>
 	<p id="disclaimer">Created by fritteli, inspired by <a href="http://www.qlocktwo.com/">QLOCKTWO</a>.
 	<script type="text/javascript" src="uhr-de_CH.js"></script>
 	<script type="text/javascript" src="uhr-de.js"></script>
 	<script type="text/javascript" src="uhr-en.js"></script>
 	<script type="text/javascript">
+		var height = jQuery(window).height();
+		var width = jQuery(window).width();
+		var size = height < width ? height : width;
 		new Uhr(jQuery('#uhr'), {
 			layout: 'de_CH',
 			theme: 'black',
 			status: 'on',
-			width: '20em'
+			width: size + 'px'
 		});
 	</script>
 </body>
diff --git a/uhr.js b/uhr.js
index 3b09ed0..7b2408e 100644
--- a/uhr.js
+++ b/uhr.js
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * @param clockarea   Das jQuery-gewrappte HTML-Element, auf dem die Uhr angezeigt werden soll.
  * @param themeElement Das HTML-Stylesheet-Tag, das das Theme-CSS referenziert.
  */
-if (typeof Uhr === 'undefined') {
+//if (typeof Uhr === 'undefined') {
 function Uhr(clockarea, settings) {
 	this.id = Uhr.id++;
 	this.timer = null;
@@ -340,5 +340,4 @@ function m(letter) {
 	}
 	return l(letter, style);
 }
-}
-
+//}
