diff --git a/src/Home.jsx b/src/Home.jsx
index 600cc62..255e901 100644
--- a/src/Home.jsx
+++ b/src/Home.jsx
@@ -97,7 +97,7 @@ function UnregisteredView({
 }) {
   return (
     <div className={classNames(styles.home, styles.fullWidth)}>
-      <Header>
+      <Header className={styles.header}>
         <LeftNav>
           <HeaderLogo />
         </LeftNav>
@@ -197,8 +197,8 @@ function RegisteredView({
         [styles.fullWidth]: hideCallList,
       })}
     >
-      <Header>
-        <LeftNav>
+      <Header className={styles.header}>
+        <LeftNav className={styles.leftNav}>
           <HeaderLogo />
         </LeftNav>
         <RightNav>
diff --git a/src/Home.module.css b/src/Home.module.css
index 669702b..dcf1ce2 100644
--- a/src/Home.module.css
+++ b/src/Home.module.css
@@ -22,6 +22,10 @@
   background-color: var(--bgColor1);
 }
 
+.fullWidth .header {
+  background-color: var(--bgColor1);
+}
+
 .centered {
   display: flex;
   flex-direction: column;
@@ -112,7 +116,7 @@
     background-color: var(--bgColor2);
   }
 
-  .leftNav:not(.fullWidth) {
+  .home:not(.fullWidth) .leftNav {
     background-color: var(--bgColor2);
   }
 
@@ -121,7 +125,8 @@
   }
 
   .fullWidth .content hr:after,
-  .left .content hr:after {
+  .left .content hr:after,
+  .fullWidth .header {
     background-color: var(--bgColor2);
   }
 }
diff --git a/src/LoginPage.jsx b/src/LoginPage.jsx
index 6c92c18..67493cd 100644
--- a/src/LoginPage.jsx
+++ b/src/LoginPage.jsx
@@ -16,11 +16,11 @@ limitations under the License.
 
 import React, { useCallback, useRef, useState } from "react";
 import { useHistory, useLocation, Link } from "react-router-dom";
-import { Header, HeaderLogo, LeftNav } from "./Header";
+import { ReactComponent as Logo } from "./icons/LogoLarge.svg";
 import { FieldRow, InputField, ErrorMessage } from "./Input";
-import { Center, Content, Info, Modal } from "./Layout";
 import { Button } from "./button";
 import { useClient } from "./ConferenceCallManagerHooks";
+import styles from "./LoginPage.module.css";
 
 export function LoginPage() {
   const { login } = useClient();
@@ -59,72 +59,65 @@ export function LoginPage() {
 
   return (
     <>
-      <Header>
-        <LeftNav>
-          <HeaderLogo />
-        </LeftNav>
-      </Header>
-      <Content>
-        <Center>
-          {loading ? (
-            <div>Loading...</div>
-          ) : (
-            <Modal>
-              <h2>Login</h2>
-              <form onSubmit={onSubmitLoginForm}>
+      <div className={styles.container}>
+        <div className={styles.content}>
+          <div className={styles.formContainer}>
+            <Logo width="auto" height="auto" className={styles.logo} />
+
+            <h2>Log In</h2>
+            <h4>To continue to Element</h4>
+            <form onSubmit={onSubmitLoginForm}>
+              <FieldRow>
+                <InputField
+                  type="text"
+                  value={homeserver}
+                  onChange={(e) => setHomeServer(e.target.value)}
+                  placeholder="Homeserver"
+                  label="Homeserver"
+                  autoCorrect="off"
+                  autoCapitalize="none"
+                />
+              </FieldRow>
+              <FieldRow>
+                <InputField
+                  type="text"
+                  ref={usernameRef}
+                  placeholder="Username"
+                  label="Username"
+                  autoCorrect="off"
+                  autoCapitalize="none"
+                />
+              </FieldRow>
+              <FieldRow>
+                <InputField
+                  type="password"
+                  ref={passwordRef}
+                  placeholder="Password"
+                  label="Password"
+                />
+              </FieldRow>
+              {error && (
                 <FieldRow>
-                  <InputField
-                    type="text"
-                    value={homeserver}
-                    onChange={(e) => setHomeServer(e.target.value)}
-                    placeholder="Homeserver"
-                    label="Homeserver"
-                    autoCorrect="off"
-                    autoCapitalize="none"
-                  />
+                  <ErrorMessage>{error.message}</ErrorMessage>
                 </FieldRow>
-                <FieldRow>
-                  <InputField
-                    type="text"
-                    ref={usernameRef}
-                    placeholder="Username"
-                    label="Username"
-                    autoCorrect="off"
-                    autoCapitalize="none"
-                  />
-                </FieldRow>
-                <FieldRow>
-                  <InputField
-                    type="password"
-                    ref={passwordRef}
-                    placeholder="Password"
-                    label="Password"
-                  />
-                </FieldRow>
-                {error && (
-                  <FieldRow>
-                    <ErrorMessage>{error.message}</ErrorMessage>
-                  </FieldRow>
-                )}
-                <FieldRow rightAlign>
-                  <Button type="submit">Login</Button>
-                </FieldRow>
-              </form>
-              <Info>
-                New?{" "}
-                <Link
-                  to={{
-                    pathname: "/register",
-                    state: location.state,
-                  }}
-                >
-                  Create account
-                </Link>
-              </Info>
-            </Modal>
-          )}
-        </Center>
-      </Content>
+              )}
+              <FieldRow>
+                <Button type="submit" disabled={loading}>
+                  {loading ? "Logging in..." : "Login"}
+                </Button>
+              </FieldRow>
+            </form>
+          </div>
+          <div className={styles.authLinks}>
+            <p>Not registered yet?</p>
+            <p>
+              <Link to="/register">Create an account</Link>
+              {" Or "}
+              <Link to="/">Access as a guest</Link>
+            </p>
+          </div>
+        </div>
+      </div>
     </>
   );
 }
diff --git a/src/LoginPage.module.css b/src/LoginPage.module.css
new file mode 100644
index 0000000..5507db5
--- /dev/null
+++ b/src/LoginPage.module.css
@@ -0,0 +1,72 @@
+.logo {
+  max-width: 300px;
+  margin: 80px 0;
+}
+
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 0 20px;
+}
+
+.content {
+  display: flex;
+  flex-direction: column;
+  max-width: 400px;
+  width: 100%;
+  height: 100vh;
+}
+
+.formContainer {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  flex: 1;
+  width: 100%;
+}
+
+.formContainer h2,
+.formContainer h4 {
+  margin-top: 0;
+}
+
+.formContainer h4 {
+  font-weight: normal;
+  font-size: 18px;
+  margin-bottom: 0;
+}
+
+.formContainer form {
+  width: 100%;
+}
+
+.formContainer form > * {
+  margin-top: 32px;
+}
+
+.formContainer button {
+  height: 48px;
+  width: 100%;
+  font-size: 15px;
+  font-weight: 600;
+}
+
+.authLinks {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  align-items: center;
+}
+
+.authLinks {
+  margin-bottom: 100px;
+  font-weight: normal;
+  font-size: 15px;
+}
+
+.authLinks a {
+  color: #0dbd8b;
+  text-decoration: none;
+}
diff --git a/src/RegisterPage.jsx b/src/RegisterPage.jsx
index 434df33..4209bc5 100644
--- a/src/RegisterPage.jsx
+++ b/src/RegisterPage.jsx
@@ -16,11 +16,11 @@ limitations under the License.
 
 import React, { useCallback, useRef, useState } from "react";
 import { useHistory, useLocation, Link } from "react-router-dom";
-import { Header, LeftNav, HeaderLogo } from "./Header";
 import { FieldRow, InputField, ErrorMessage } from "./Input";
-import { Center, Content, Info, Modal } from "./Layout";
 import { Button } from "./button";
 import { useClient } from "./ConferenceCallManagerHooks";
+import styles from "./LoginPage.module.css";
+import { ReactComponent as Logo } from "./icons/LogoLarge.svg";
 
 export function RegisterPage() {
   // TODO: Handle hitting login page with authenticated client
@@ -57,61 +57,52 @@ export function RegisterPage() {
 
   return (
     <>
-      <Header>
-        <LeftNav>
-          <HeaderLogo />
-        </LeftNav>
-      </Header>
-      <Content>
-        <Center>
-          {loading ? (
-            <div>Loading...</div>
-          ) : (
-            <Modal>
-              <h2>Register</h2>
-              <form onSubmit={onSubmitRegisterForm}>
+      <div className={styles.container}>
+        <div className={styles.content}>
+          <div className={styles.formContainer}>
+            <Logo width="auto" height="auto" className={styles.logo} />
+            <h2>Create your account</h2>
+            <form onSubmit={onSubmitRegisterForm}>
+              <FieldRow>
+                <InputField
+                  type="text"
+                  ref={registerUsernameRef}
+                  placeholder="Username"
+                  label="Username"
+                  autoCorrect="off"
+                  autoCapitalize="none"
+                />
+              </FieldRow>
+              <FieldRow>
+                <InputField
+                  type="password"
+                  ref={registerPasswordRef}
+                  placeholder="Password"
+                  label="Password"
+                />
+              </FieldRow>
+              {error && (
                 <FieldRow>
-                  <InputField
-                    type="text"
-                    ref={registerUsernameRef}
-                    placeholder="Username"
-                    label="Username"
-                    autoCorrect="off"
-                    autoCapitalize="none"
-                  />
+                  <ErrorMessage>{error.message}</ErrorMessage>
                 </FieldRow>
-                <FieldRow>
-                  <InputField
-                    type="password"
-                    ref={registerPasswordRef}
-                    placeholder="Password"
-                    label="Password"
-                  />
-                </FieldRow>
-                {error && (
-                  <FieldRow>
-                    <ErrorMessage>{error.message}</ErrorMessage>
-                  </FieldRow>
-                )}
-                <FieldRow rightAlign>
-                  <Button type="submit">Register</Button>
-                </FieldRow>
-              </form>
-              <Info>
-                Already have an account?{" "}
-                <Link
-                  to={{
-                    pathname: "/login",
-                    state: location.state,
-                  }}
-                >
-                  Sign in here
-                </Link>
-              </Info>
-            </Modal>
-          )}
-        </Center>
-      </Content>
+              )}
+              <FieldRow>
+                <Button type="submit" disabled={loading}>
+                  {loading ? "Registering..." : "Register"}
+                </Button>
+              </FieldRow>
+            </form>
+          </div>
+          <div className={styles.authLinks}>
+            <p>Already have an account?</p>
+            <p>
+              <Link to="/login">Log in</Link>
+              {" Or "}
+              <Link to="/">Access as a guest</Link>
+            </p>
+          </div>
+        </div>
+      </div>
     </>
   );
 }
diff --git a/src/icons/LogoLarge.svg b/src/icons/LogoLarge.svg
new file mode 100644
index 0000000..f7bfbd1
--- /dev/null
+++ b/src/icons/LogoLarge.svg
@@ -0,0 +1,11 @@
+<svg width="300" height="66" viewBox="0 0 300 66" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="32.6901" cy="32.6904" r="23.496" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M32.6137 65.2274C50.6257 65.2274 65.2274 50.6257 65.2274 32.6137C65.2274 14.6016 50.6257 0 32.6137 0C14.6016 0 0 14.6016 0 32.6137C0 50.6257 14.6016 65.2274 32.6137 65.2274ZM26.6511 15.1961C26.6511 13.8796 27.7205 12.8124 29.0397 12.8124C37.9808 12.8124 45.2291 20.0456 45.2291 28.9681C45.2291 30.2846 44.1596 31.3518 42.8405 31.3518C41.5213 31.3518 40.4519 30.2846 40.4519 28.9681C40.4519 22.6785 35.3425 17.5797 29.0397 17.5797C27.7205 17.5797 26.6511 16.5125 26.6511 15.1961ZM52.4139 28.9683C52.4139 27.6518 51.3445 26.5846 50.0253 26.5846C48.7061 26.5846 47.6367 27.6518 47.6367 28.9683C47.6367 35.2579 42.5274 40.3567 36.2246 40.3567C34.9054 40.3567 33.836 41.4239 33.836 42.7404C33.836 44.0568 34.9054 45.124 36.2246 45.124C45.1657 45.124 52.4139 37.8909 52.4139 28.9683ZM38.6134 50.031C38.6134 51.3475 37.544 52.4146 36.2248 52.4146C27.2837 52.4146 20.0355 45.1815 20.0355 36.2589C20.0355 34.9425 21.1049 33.8753 22.4241 33.8753C23.7432 33.8753 24.8127 34.9425 24.8127 36.2589C24.8127 42.5486 29.922 47.6474 36.2248 47.6474C37.544 47.6474 38.6134 48.7146 38.6134 50.031ZM12.8113 36.2589C12.8113 37.5754 13.8808 38.6426 15.1999 38.6426C16.5191 38.6426 17.5885 37.5754 17.5885 36.2589C17.5885 29.9693 22.6979 24.8705 29.0007 24.8705C30.3198 24.8705 31.3893 23.8033 31.3893 22.4869C31.3893 21.1704 30.3198 20.1032 29.0007 20.1032C20.0595 20.1032 12.8113 27.3364 12.8113 36.2589Z" fill="#0DBD8B"/>
+<path d="M114.73 36.9816H91.7256C91.9974 39.3888 92.871 41.3107 94.3464 42.7472C95.8217 44.1449 97.763 44.8438 100.17 44.8438C101.762 44.8438 103.199 44.4555 104.48 43.679C105.761 42.9025 106.674 41.8542 107.217 40.5341H114.206C113.274 43.6014 111.527 46.0862 108.964 47.9887C106.441 49.8523 103.451 50.7842 99.9955 50.7842C95.4917 50.7842 91.8421 49.2894 89.0466 46.2998C86.29 43.3102 84.9117 39.5247 84.9117 34.9432C84.9117 30.4783 86.3094 26.7316 89.1049 23.7032C91.9003 20.6747 95.5111 19.1605 99.9373 19.1605C104.363 19.1605 107.935 20.6553 110.653 23.6449C113.41 26.5957 114.788 30.323 114.788 34.8267L114.73 36.9816ZM99.9373 24.8097C97.763 24.8097 95.9576 25.4503 94.5211 26.7316C93.0845 28.0128 92.1915 29.7212 91.8421 31.8566H107.916C107.605 29.7212 106.751 28.0128 105.353 26.7316C103.956 25.4503 102.15 24.8097 99.9373 24.8097Z" fill="white"/>
+<path d="M119.557 41.0583V6.40625H126.488V41.1748C126.488 42.7278 127.342 43.5043 129.05 43.5043L130.273 43.4461V50.0271C129.613 50.1435 128.914 50.2018 128.177 50.2018C125.187 50.2018 122.993 49.4447 121.596 47.9305C120.237 46.4163 119.557 44.1255 119.557 41.0583Z" fill="white"/>
+<path d="M162.549 36.9816H139.545C139.817 39.3888 140.69 41.3107 142.166 42.7472C143.641 44.1449 145.582 44.8438 147.99 44.8438C149.582 44.8438 151.018 44.4555 152.299 43.679C153.581 42.9025 154.493 41.8542 155.037 40.5341H162.025C161.093 43.6014 159.346 46.0862 156.784 47.9887C154.26 49.8523 151.27 50.7842 147.815 50.7842C143.311 50.7842 139.662 49.2894 136.866 46.2998C134.109 43.3102 132.731 39.5247 132.731 34.9432C132.731 30.4783 134.129 26.7316 136.924 23.7032C139.72 20.6747 143.331 19.1605 147.757 19.1605C152.183 19.1605 155.755 20.6553 158.473 23.6449C161.229 26.5957 162.608 30.323 162.608 34.8267L162.549 36.9816ZM147.757 24.8097C145.582 24.8097 143.777 25.4503 142.341 26.7316C140.904 28.0128 140.011 29.7212 139.662 31.8566H155.735C155.425 29.7212 154.571 28.0128 153.173 26.7316C151.775 25.4503 149.97 24.8097 147.757 24.8097Z" fill="white"/>
+<path d="M193.817 32.7302V50.0853H186.887V31.973C186.887 27.3916 184.984 25.1009 181.179 25.1009C179.122 25.1009 177.471 25.7609 176.229 27.081C175.025 28.4011 174.424 30.2065 174.424 32.4972V50.0853H167.493V19.8594H173.9V23.8779C174.637 22.519 175.763 21.393 177.277 20.5C178.792 19.607 180.675 19.1605 182.927 19.1605C187.12 19.1605 190.148 20.7524 192.012 23.9361C194.574 20.7524 197.991 19.1605 202.262 19.1605C205.795 19.1605 208.513 20.2671 210.415 22.4801C212.318 24.6544 213.269 27.5275 213.269 31.0995V50.0853H206.338V31.973C206.338 27.3916 204.436 25.1009 200.631 25.1009C198.535 25.1009 196.865 25.7803 195.623 27.1392C194.419 28.4593 193.817 30.323 193.817 32.7302Z" fill="white"/>
+<path d="M247.735 36.9816H224.731C225.002 39.3888 225.876 41.3107 227.351 42.7472C228.827 44.1449 230.768 44.8438 233.175 44.8438C234.767 44.8438 236.204 44.4555 237.485 43.679C238.766 42.9025 239.678 41.8542 240.222 40.5341H247.211C246.279 43.6014 244.532 46.0862 241.969 47.9887C239.446 49.8523 236.456 50.7842 233 50.7842C228.497 50.7842 224.847 49.2894 222.052 46.2998C219.295 43.3102 217.917 39.5247 217.917 34.9432C217.917 30.4783 219.314 26.7316 222.11 23.7032C224.905 20.6747 228.516 19.1605 232.942 19.1605C237.368 19.1605 240.94 20.6553 243.658 23.6449C246.415 26.5957 247.793 30.323 247.793 34.8267L247.735 36.9816ZM232.942 24.8097C230.768 24.8097 228.963 25.4503 227.526 26.7316C226.089 28.0128 225.196 29.7212 224.847 31.8566H240.921C240.61 29.7212 239.756 28.0128 238.358 26.7316C236.961 25.4503 235.155 24.8097 232.942 24.8097Z" fill="white"/>
+<path d="M259.085 19.8594V23.8779C259.784 22.5578 260.929 21.4513 262.521 20.5583C264.152 19.6264 266.113 19.1605 268.403 19.1605C271.975 19.1605 274.732 20.2477 276.673 22.4219C278.653 24.5961 279.643 27.4887 279.643 31.0995V50.0853H272.713V31.973C272.713 29.8376 272.208 28.1681 271.199 26.9645C270.228 25.7221 268.733 25.1009 266.714 25.1009C264.501 25.1009 262.754 25.7609 261.473 27.081C260.23 28.4011 259.609 30.2259 259.609 32.5554V50.0853H252.679V19.8594H259.085Z" fill="white"/>
+<path d="M299.884 43.912V49.9106C299.029 50.1435 297.826 50.26 296.273 50.26C290.371 50.26 287.42 47.2898 287.42 41.3495V25.3921H282.82V19.8594H287.42V11.9972H294.351V19.8594H300V25.3921H294.351V40.6506C294.351 43.019 295.477 44.2032 297.729 44.2032L299.884 43.912Z" fill="white"/>
+</svg>