diff --git a/src/screens/App.js b/src/screens/App.js
index 671185f..c1c6239 100644
--- a/src/screens/App.js
+++ b/src/screens/App.js
@@ -10,7 +10,8 @@ const containerStyle = {
 	margin: '0 auto',
 	borderRadius: 7,
 	background: 'white',
-	marginTop: 50,
+	marginTop: '10vh',
+	marginBottom: '10vh',
 };
 
 function App() {
diff --git a/src/screens/Login.js b/src/screens/Login.js
index 7b5702b..1696d30 100644
--- a/src/screens/Login.js
+++ b/src/screens/Login.js
@@ -1,55 +1,57 @@
 import React from 'react';
 
 import {
-	Container,
 	Content,
 	FlexboxGrid,
 	Panel,
 	Form,
 	FormGroup,
-	ControlLabel,
 	FormControl,
+	HelpBlock,
 	Button,
-	ButtonToolbar,
 } from 'rsuite';
 
+const boxStyle = {
+	margin: '50px 10px',
+};
+
 function Login() {
 	return (
-		<Container>
-			<Content>
-				<FlexboxGrid justify='center'>
-					<FlexboxGrid.Item>
-						<Panel header={<h3>Login</h3>} bordered>
-							<Form fluid>
-								<FormGroup>
-									<ControlLabel>
-										Username or email address
-									</ControlLabel>
-									<FormControl name='name' />
-								</FormGroup>
-								<FormGroup>
-									<ControlLabel>Password</ControlLabel>
-									<FormControl
-										name='password'
-										type='password'
-									/>
-								</FormGroup>
-								<FormGroup>
-									<ButtonToolbar>
-										<Button appearance='primary'>
-											Sign in
-										</Button>
-										<Button appearance='link'>
-											Forgot password?
-										</Button>
-									</ButtonToolbar>
-								</FormGroup>
-							</Form>
-						</Panel>
-					</FlexboxGrid.Item>
-				</FlexboxGrid>
-			</Content>
-		</Container>
+		<Content>
+			<FlexboxGrid justify='center'>
+				<FlexboxGrid.Item>
+					<Panel
+						header={<h3>Login</h3>}
+						bordered
+						style={boxStyle}
+					>
+						<Form horizontal>
+							<FormGroup>
+								<FormControl
+									name='email'
+									type='email'
+									placeholder='email'
+								/>
+							</FormGroup>
+							<FormGroup>
+								<FormControl
+									name='password'
+									type='password'
+									placeholder='password'
+								/>
+								<HelpBlock tooltip>
+									Minimum password length is 8 characters
+								</HelpBlock>
+							</FormGroup>
+							<FormGroup>
+								<Button appearance='primary' block>Sign in</Button>
+							</FormGroup>
+							<Button appearance='link'>Forgot password?</Button>
+						</Form>
+					</Panel>
+				</FlexboxGrid.Item>
+			</FlexboxGrid>
+		</Content>
 	);
 }