diff --git a/client.html b/client.html
index a1b09b771868c9239c63a72ecebd4d61050c2884..b8f49b328d053134bcdc577d2e86985be4945b20 100644
--- a/client.html
+++ b/client.html
@@ -1,32 +1,42 @@
+<!DOCTYPE html>
<html>
<head>
+ <title>Twidder</title>
<link href="client.css" type="text/css" rel="stylesheet">
<script src="client.js" type="text/javascript"></script>
<script src="serverstub.js" type="text/javascript"></script>
+ <script type="text/view" id="welcomeview">
+ <div id="layout">
+ <div id="image">
+ <img src="wimage.png" alt="Twidder logo" width="340" height="400">
+ </div>
+ <div id="forms">
+ <div id="login">
+ <form onsubmit="return false">
+ <label for="email">Email</label><input type="email" id="email" required><br /><br />
+ <label for="password">Password</label><input type="password" id="password" required><br /><br />
+ <input type="submit" id="login" onclick="loginUser()" name="login" value="Login">
+ </form>
+ </div>
+ <div id="signup">
+ <form onsubmit="createUser();return false" id="signup">
+ <label for="email">Email</label><input type="email" id="emailsignup"><br /><br />
+ <label for="password">Password</label><input type="password" id="passwordsignup"><br /><br />
+ <label for="repassword">Repeat password</label><input type="password" id="repasswordsignup"><br /><br />
+ <label for="firstname">First Name</label><input type="text" id="firstname"><br /><br />
+ <label for="familyname">Family Name</label><input type="text" id="familyname"><br /><br />
+ <label for="gender">Gender</label>
+ <select id="gender" name="gender">
+ <option value="Male">Male</option>
+ <option value="Female">Female</option>
+ <option value="Other">Other</option>
+ </select><br /><br />
+ <label for="city">City</label><input type="text" id="city"><br /><br />
+ <label for="country">Country</label><input type="text" id="country"><br /><br />
+ <input type="submit" id="signup" name="signup" value="Signup">
+ </form>
+ </div>
+ </div>
+ </script>
</head>
- <body>
- <div id="main-left">
- </div>
- <div id="right-top">
- <form action="" id="save-form" onsubmit="saveContent(this); return false">
- <div><label for="name">Name</label><input type="text" id="name" name="name"></div>
- <div><label for="number">Number</label><input type="text" id="number" name="phonenumber"></div>
- <input type="submit">
- </form>
- </div>
- <div id="right-dow">
- <form action="" id="save-form" onsubmit="saveContent(this); return false">
- <div><label for="name">FirstName</label><input type="text" id="name" name="name"></div>
- <div><label for="number">FamilyName</label><input type="text" id="number" name="phonenumber"></div>
- <div><label for="name">FirstName</label><input type="text" id="name" name="name"></div>
- <div><label for="number">FamilyName</label><input type="text" id="number" name="phonenumber"></div>
- <div><label for="name">FirstName</label><input type="text" id="name" name="name"></div>
- <div><label for="number">FamilyName</label><input type="text" id="number" name="phonenumber"></div>
- <input type="submit">
- </form>
-
- </div>
-
-
- </body>
-</html>
\ No newline at end of file
+</html>