diff --git a/src/components/DrawTools.js b/src/components/DrawTools.js
index 791233b3996d525e4c1da055f69011f66546aa46..0cc196b4dbe101d4160de9614b7abf46cc36bbdd 100644
--- a/src/components/DrawTools.js
+++ b/src/components/DrawTools.js
@@ -6,7 +6,7 @@ import {
 
 class DrawTools extends Component {
 	_onCreated = (e) => {
-		let type = e.layerType; // from the example; isn't used right now, but may be relevant in the future
+		//let type = e.layerType; // from the example; isn't used right now, but may be relevant in the future
 		let layer = e.layer;		
 		let geoJSON = layer.toGeoJSON();
 		console.log(JSON.stringify(geoJSON, null, 4)); // makes the output readable in the console
diff --git a/src/components/LoginForm.js b/src/components/LoginForm.js
index 7893bb8c967509d8589d31665e1f1a57c4b34fcb..89b15f365acdc7e42d3105e9e4f8cf9a72cdc00b 100644
--- a/src/components/LoginForm.js
+++ b/src/components/LoginForm.js
@@ -86,13 +86,14 @@ export class LoginForm extends React.Component {
         </div>
         <div className='login'>
           <form onSubmit={this.handleLogin}>
-            <h1>demo login</h1>
+            <h1>login</h1>
             <br />
             <input
               placeholder='Enter Username'
               name='username'
               value={this.state.username}
               onChange={this.handleChange}
+              autoFocus
               required
             />
             <br />
diff --git a/src/components/RegisterForm.js b/src/components/RegisterForm.js
index f0ead02cce19af21937d132a54443f593d8ad9d4..56360b6f7c1565c49aa11d8ad7957ab156c35dce 100644
--- a/src/components/RegisterForm.js
+++ b/src/components/RegisterForm.js
@@ -100,6 +100,7 @@ export class RegisterForm extends React.Component {
               name='username'
               value={this.state.username}
               onChange={this.handleChange}
+              autoFocus
               required
             />
             <br />
diff --git a/src/components/UserMap.js b/src/components/UserMap.js
index 1ec4c484d990b5b29ff443a7840a86e2517bda78..1f0868e5f895412d8f7e0f42733e68f5158bfe25 100644
--- a/src/components/UserMap.js
+++ b/src/components/UserMap.js
@@ -2,11 +2,10 @@ import React, {Component} from 'react';
 import {
 	Map,
 	TileLayer,
-  ZoomControl,
   Marker,
   Popup
 } from 'react-leaflet'
-import DrawTools from './DrawTools.js'
+import DrawTools from './DrawTools'
 
 class UserMap extends Component {
   constructor(props){
@@ -84,11 +83,10 @@ class UserMap extends Component {
           attribution='&copy; <a href="https://www.maanmittauslaitos.fi/">Maanmittauslaitos</a>'
           url={this.props.mapUrl}
         />
-        <ZoomControl position='topright' />
 		    <DrawTools position={this.props.position} />
         <Marker position={this.props.position}>
-          <Popup>
-            Se on perjantai, my dudes <br />
+          <Popup maxWidth="600px">
+          <iframe title="Esitys" src="https://jamkstudent-my.sharepoint.com/personal/l4074_student_jamk_fi/_layouts/15/Doc.aspx?sourcedoc={175bb4df-310a-4e1e-b805-e02e8dd4d6c5}&amp;action=embedview&amp;wdAr=1.7777777777777777" width="600px" height="400px" autoplay frameborder="0">Welcome to Wimma LAB<a href="https://office.com">Microsoft Office</a> presentation, powered by <a href="https://office.com/webapps">Office Online</a>.</iframe>
           </Popup>
         </Marker>
         {this.state.ownLat !== null && <Marker position={[this.state.ownLat, this.state.ownLng]}>