diff --git a/vote-lunch/src/components/addOption.js b/vote-lunch/src/components/addOption.js
new file mode 100644
index 0000000..4cd4649
--- /dev/null
+++ b/vote-lunch/src/components/addOption.js
@@ -0,0 +1,51 @@
+import React, {useState} from 'react'
+import styled from 'styled-components'
+import deepleImg from '../deeple.png'
+
+const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem;
+`
+
+const InputField = styled.input`
+  font-size: 1.5rem;
+  line-height: 2.2rem;
+  padding: 0.5rem;
+  width: 90%;
+  margin: 1.5rem 0;
+  border: solid 2px blueviolet;
+  border-radius: 5px;
+`
+
+const Btn = styled.div`
+  height: 2.2rem;
+  padding: 0.5rem;
+  width: 90%;
+  font-size: 1.5rem;
+  background-color: blueviolet;
+  border: solid 2px blueviolet;
+  color: #fff;
+  border-radius: 5px;
+  text-align: center;
+`
+
+const Text = styled.p`
+  margin: 1rem 0;
+  font-size: 1.5rem;
+  font-weight: bold;
+`
+
+const AddOption = props => {
+  const { handleAddOption } = props
+  const [option, setOption] = useState(undefined)
+  return <Container>
+    <Text>Add Option</Text>
+    <InputField placeholder='Enter Option' onChange={e => setOption(e.target.value)} />
+    <Btn onClick={() => handleAddOption(option)}>ADD</Btn>
+  </Container>
+}
+
+export default AddOption
\ No newline at end of file
diff --git a/vote-lunch/src/components/mainLayout.js b/vote-lunch/src/components/mainLayout.js
index 499aac4..f14d69d 100644
--- a/vote-lunch/src/components/mainLayout.js
+++ b/vote-lunch/src/components/mainLayout.js
@@ -1,13 +1,17 @@
 import React, { useState } from 'react'
 import styled from 'styled-components'
+import _ from 'lodash'
 
 import Header from './haeder'
 import Modal from './modal'
 import Login from './login'
+import AddOption from './addOption'
 import VoteList from './voteList'
 import Result from './voteResult'
 
 const USER_KEY = 'DEEPLE_USER'
+const RESTRUANT_LIST_KEY = 'RESTRUANT_LIST'
+const ALL_VOTE_KEY = 'ALL_VOTE'
 
 const Container = styled.div`
   display: flex;
@@ -20,11 +24,33 @@ const mocklist = [
   {checked: false, text: 'ข้าวมันไก่'}
 ]
 
+const getLocalStorage = () => {
+  const user = localStorage.getItem(USER_KEY)
+  let restaurants = localStorage.getItem(RESTRUANT_LIST_KEY)
+  restaurants = restaurants && JSON.parse(restaurants)
+
+  let votes = localStorage.getItem(ALL_VOTE_KEY)
+  votes = votes && JSON.parse(votes)
+
+  return {
+    user,
+    restaurants,
+    votes
+  }
+}
+
 const MainLayout = () => {
+  const initData = getLocalStorage()
+
   const [isOpenLoginModal, setOpenLoginModal] = useState(false)
   const [isOpenOptionModal, setOpenOptionModal] = useState(false)
   const [showResult, setShowResult] = useState(false)
-  const [currentUser, setcrrUser] = useState(localStorage.getItem(USER_KEY))
+  const [currentUser, setcrrUser] = useState(initData.user)
+  const [restaurantList, setRestaurantList] = useState(initData.restaurants)
+  const [allVote, setAllVote] = useState(initData.votes)
+  const getVoteFromCrrUser = allVote && _.find(allVote, vote => vote.user === currentUser)
+
+  const [currentUserVote, setCrrUserVote] = useState(getVoteFromCrrUser ? getVoteFromCrrUser.vote : [])
   return <div>
     <Header
       title="deeple lunch"
@@ -37,7 +63,7 @@ const MainLayout = () => {
     />
     <Container>
       {
-        showResult ? <Result /> : <VoteList list={mocklist} handleAddOption={() => setOpenOptionModal(true)} handleVoteChange={() => {}} />
+        showResult ? <Result /> : <VoteList restaurantlist={restaurantList} currentUserVote={currentUserVote} handleAddOption={() => setOpenOptionModal(true)} handleVoteChange={() => {}} />
       }      
       <div onClick={() => setShowResult(!showResult)}>triggre show result</div>
     </Container>
@@ -55,7 +81,15 @@ const MainLayout = () => {
       isOpen={isOpenOptionModal}
       handleCloseModal={() => setOpenOptionModal(false)}
     >
-      add option
+      <AddOption handleAddOption={option => {
+        const crrList = restaurantList || []
+        crrList.push(option)
+        const computeList = JSON.stringify(crrList)
+
+        localStorage.setItem(RESTRUANT_LIST_KEY, computeList)
+        setRestaurantList(crrList)
+        setOpenOptionModal(false)
+      }} />
     </Modal>
   </div>
 }
diff --git a/vote-lunch/src/components/voteList.js b/vote-lunch/src/components/voteList.js
index 6d14b69..e283252 100644
--- a/vote-lunch/src/components/voteList.js
+++ b/vote-lunch/src/components/voteList.js
@@ -1,5 +1,6 @@
 import React from 'react'
 import styled from 'styled-components'
+import _ from 'lodash'
 
 import Checkbox from './check'
 
@@ -13,9 +14,14 @@ const Container = styled.div`
 `
 
 const VoteList = props => {
-  const { list, handleVoteChange, handleAddOption } = props
+  const { restaurantlist, handleVoteChange, handleAddOption, currentUserVote } = props
   return <Container>
-    {list && list.map(data => <Checkbox text={data.text} initCheck={data.checked} handleChangeChecked={handleVoteChange} />)}
+    {
+      restaurantlist && restaurantlist.map(data => {
+        const checkedVal = _.indexOf(currentUserVote, data)
+        return <Checkbox text={data} initCheck={checkedVal !== -1} handleChangeChecked={handleVoteChange} />
+      })
+    }
     <Checkbox text="Add an option" isAddOption addOptionClick={handleAddOption} />
   </Container>
 }