diff --git a/contracts.json b/contracts.json
deleted file mode 100644
index 40c6bf1..0000000
--- a/contracts.json
+++ /dev/null
@@ -1 +0,0 @@
-{"token address":"0xf61d0CC1132953742839FD2D72c5e51d4B5B6042","token owner":"0xD5a83F9fce3e7657151064f08135bFd1b9cb5FFa","token abi":[{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}],"bounty address":"0xa102Bc83f8452059f45b2eF334aA12801aE26ED6","bounty owner":"0x64cA912901bf88B98dD1B862DFb355C4182D9269","bounty abi":[{"constant":true,"inputs":[],"name":"getBalance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"},{"name":"_tokenAddress","type":"address"}],"name":"withdrawFeeToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_bountyDuration","type":"uint256"}],"name":"setBountyDuration","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyDuration","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyBeneficiariesCount","type":"uint256"}],"name":"setBountyBeneficiariesCount","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_minBounty","type":"uint256"}],"name":"setMinBounty","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"}],"name":"createBounty","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"},{"name":"_user","type":"address"},{"name":"_reward","type":"uint256"}],"name":"rewardUser","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyBeneficiariesCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"},{"name":"_tokenAddress","type":"address"}],"name":"createBountyERC20","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyDurationPosterAllowed","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"minBounty","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_tokenAddress","type":"address"},{"name":"_bountyFee","type":"uint256"}],"name":"setBountyFeeToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_tokenAddress","type":"address"},{"name":"_minBounty","type":"uint256"}],"name":"setMinBountyToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_tokenAddress","type":"address"}],"name":"getMinBountyToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"withdrawFee","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_tokenAddress","type":"address"}],"name":"getBountyFeeToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"bountyFeeCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"}],"name":"cancelBounty","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_bountyId","type":"uint256"}],"name":"getBounty","outputs":[{"name":"","type":"uint256"},{"name":"","type":"address"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"bool"},{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"},{"name":"_users","type":"address[]"},{"name":"_rewards","type":"uint256[]"}],"name":"rewardUsers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_msg","type":"string"},{"indexed":false,"name":"_id","type":"uint256"},{"indexed":false,"name":"_from","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"BountyStatus","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_msg","type":"string"},{"indexed":false,"name":"_id","type":"uint256"},{"indexed":false,"name":"_to","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"RewardStatus","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_msg","type":"string"},{"indexed":false,"name":"_id","type":"uint256"},{"indexed":false,"name":"_to","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"ErrorStatus","type":"event"}]}
\ No newline at end of file
diff --git a/contracts/openZeppelin/token/ERC20/BasicToken.sol b/contracts/openZeppelin/token/ERC20/BasicToken.sol
index 1042c2f..a8127e3 100644
--- a/contracts/openZeppelin/token/ERC20/BasicToken.sol
+++ b/contracts/openZeppelin/token/ERC20/BasicToken.sol
@@ -14,7 +14,10 @@ contract BasicToken is ERC20Basic {
 
   mapping(address => uint256) balances;
 
+  uint8 public decimals_;
   uint256 totalSupply_;
+  string public name_;
+  string public symbol_;
 
   /**
   * @dev total number of tokens in existence
diff --git a/contracts/openZeppelin/token/ERC20/DetailedERC20.sol b/contracts/openZeppelin/token/ERC20/DetailedERC20.sol
deleted file mode 100644
index 749d960..0000000
--- a/contracts/openZeppelin/token/ERC20/DetailedERC20.sol
+++ /dev/null
@@ -1,16 +0,0 @@
-pragma solidity ^0.4.23;
-
-import "./ERC20.sol";
-
-
-contract DetailedERC20 is ERC20 {
-  string public name;
-  string public symbol;
-  uint8 public decimals;
-
-  constructor(string _name, string _symbol, uint8 _decimals) public {
-    name = _name;
-    symbol = _symbol;
-    decimals = _decimals;
-  }
-}
diff --git a/contracts/openZeppelin/token/ERC20/StandardToken.sol b/contracts/openZeppelin/token/ERC20/StandardToken.sol
index 1ef27d2..8371ba8 100644
--- a/contracts/openZeppelin/token/ERC20/StandardToken.sol
+++ b/contracts/openZeppelin/token/ERC20/StandardToken.sol
@@ -2,6 +2,7 @@ pragma solidity ^0.4.23;
 
 import "./BasicToken.sol";
 import "./ERC20.sol";
+import "../../ownership/Ownable.sol";
 
 
 /**
@@ -11,10 +12,15 @@ import "./ERC20.sol";
  * @dev https://github.com/ethereum/EIPs/issues/20
  * @dev Based on code by FirstBlood: https://github.com/Firstbloodio/token/blob/master/smart_contract/FirstBloodToken.sol
  */
-contract StandardToken is ERC20, BasicToken {
+contract StandardToken is ERC20, BasicToken, Ownable {
 
   mapping (address => mapping (address => uint256)) internal allowed;
 
+  constructor() public {
+      decimals_ = 18;
+      totalSupply_ = 1e9 * 10 ** decimals_;
+      balances[owner] = totalSupply_;
+  }
 
   /**
    * @dev Transfer tokens from one address to another
diff --git a/deploy/contracts.json b/deploy/contracts.json
index eac328a..be4da30 100644
--- a/deploy/contracts.json
+++ b/deploy/contracts.json
@@ -1,732 +1 @@
-{
-    "token address": "0xB6A53d6C8E9E7A1F69A057e99405bDa7A4977478",
-    "token owner": "0xD5a83F9fce3e7657151064f08135bFd1b9cb5FFa",
-    "token abi": [
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_spender",
-                    "type": "address"
-                },
-                {
-                    "name": "_value",
-                    "type": "uint256"
-                }
-            ],
-            "name": "approve",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "bool"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "totalSupply",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_from",
-                    "type": "address"
-                },
-                {
-                    "name": "_to",
-                    "type": "address"
-                },
-                {
-                    "name": "_value",
-                    "type": "uint256"
-                }
-            ],
-            "name": "transferFrom",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "bool"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_spender",
-                    "type": "address"
-                },
-                {
-                    "name": "_subtractedValue",
-                    "type": "uint256"
-                }
-            ],
-            "name": "decreaseApproval",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "bool"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [
-                {
-                    "name": "_owner",
-                    "type": "address"
-                }
-            ],
-            "name": "balanceOf",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_to",
-                    "type": "address"
-                },
-                {
-                    "name": "_value",
-                    "type": "uint256"
-                }
-            ],
-            "name": "transfer",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "bool"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_spender",
-                    "type": "address"
-                },
-                {
-                    "name": "_addedValue",
-                    "type": "uint256"
-                }
-            ],
-            "name": "increaseApproval",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "bool"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [
-                {
-                    "name": "_owner",
-                    "type": "address"
-                },
-                {
-                    "name": "_spender",
-                    "type": "address"
-                }
-            ],
-            "name": "allowance",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "name": "owner",
-                    "type": "address"
-                },
-                {
-                    "indexed": true,
-                    "name": "spender",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "name": "value",
-                    "type": "uint256"
-                }
-            ],
-            "name": "Approval",
-            "type": "event"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": true,
-                    "name": "from",
-                    "type": "address"
-                },
-                {
-                    "indexed": true,
-                    "name": "to",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "name": "value",
-                    "type": "uint256"
-                }
-            ],
-            "name": "Transfer",
-            "type": "event"
-        }
-    ],
-    "bounty address": "0x0d5E132e7616B97570c2A349DcAEA74AE24efDf2",
-    "bounty owner": "0x64cA912901bf88B98dD1B862DFb355C4182D9269",
-    "bounty abi": [
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "getBalance",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_amount",
-                    "type": "uint256"
-                },
-                {
-                    "name": "_tokenAddress",
-                    "type": "address"
-                }
-            ],
-            "name": "withdrawFeeToken",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_bountyDuration",
-                    "type": "uint256"
-                }
-            ],
-            "name": "setBountyDuration",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "bountyDuration",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_bountyBeneficiariesCount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "setBountyBeneficiariesCount",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_minBounty",
-                    "type": "uint256"
-                }
-            ],
-            "name": "setMinBounty",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "bountyCount",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_bountyId",
-                    "type": "uint256"
-                }
-            ],
-            "name": "createBounty",
-            "outputs": [],
-            "payable": true,
-            "stateMutability": "payable",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_bountyId",
-                    "type": "uint256"
-                },
-                {
-                    "name": "_user",
-                    "type": "address"
-                },
-                {
-                    "name": "_reward",
-                    "type": "uint256"
-                }
-            ],
-            "name": "rewardUser",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "bountyBeneficiariesCount",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_bountyId",
-                    "type": "uint256"
-                },
-                {
-                    "name": "_tokenAddress",
-                    "type": "address"
-                }
-            ],
-            "name": "createBountyERC20",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "bountyDurationPosterAllowed",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "minBounty",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "owner",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "address"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_tokenAddress",
-                    "type": "address"
-                },
-                {
-                    "name": "_bountyFee",
-                    "type": "uint256"
-                }
-            ],
-            "name": "setBountyFeeToken",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [],
-            "name": "bountyFee",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_tokenAddress",
-                    "type": "address"
-                },
-                {
-                    "name": "_minBounty",
-                    "type": "uint256"
-                }
-            ],
-            "name": "setMinBountyToken",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [
-                {
-                    "name": "_tokenAddress",
-                    "type": "address"
-                }
-            ],
-            "name": "getMinBountyToken",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "withdrawFee",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [
-                {
-                    "name": "_tokenAddress",
-                    "type": "address"
-                }
-            ],
-            "name": "getBountyFeeToken",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [
-                {
-                    "name": "",
-                    "type": "address"
-                }
-            ],
-            "name": "bountyFeeCount",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_bountyId",
-                    "type": "uint256"
-                }
-            ],
-            "name": "cancelBounty",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "constant": true,
-            "inputs": [
-                {
-                    "name": "_bountyId",
-                    "type": "uint256"
-                }
-            ],
-            "name": "getBounty",
-            "outputs": [
-                {
-                    "name": "",
-                    "type": "uint256"
-                },
-                {
-                    "name": "",
-                    "type": "address"
-                },
-                {
-                    "name": "",
-                    "type": "uint256"
-                },
-                {
-                    "name": "",
-                    "type": "uint256"
-                },
-                {
-                    "name": "",
-                    "type": "uint256"
-                },
-                {
-                    "name": "",
-                    "type": "uint256"
-                },
-                {
-                    "name": "",
-                    "type": "bool"
-                },
-                {
-                    "name": "",
-                    "type": "bool"
-                }
-            ],
-            "payable": false,
-            "stateMutability": "view",
-            "type": "function"
-        },
-        {
-            "constant": false,
-            "inputs": [
-                {
-                    "name": "_bountyId",
-                    "type": "uint256"
-                },
-                {
-                    "name": "_users",
-                    "type": "address[]"
-                },
-                {
-                    "name": "_rewards",
-                    "type": "uint256[]"
-                }
-            ],
-            "name": "rewardUsers",
-            "outputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "function"
-        },
-        {
-            "inputs": [],
-            "payable": false,
-            "stateMutability": "nonpayable",
-            "type": "constructor"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": false,
-                    "name": "_msg",
-                    "type": "string"
-                },
-                {
-                    "indexed": false,
-                    "name": "_id",
-                    "type": "uint256"
-                },
-                {
-                    "indexed": false,
-                    "name": "_from",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "name": "_amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "BountyStatus",
-            "type": "event"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": false,
-                    "name": "_msg",
-                    "type": "string"
-                },
-                {
-                    "indexed": false,
-                    "name": "_id",
-                    "type": "uint256"
-                },
-                {
-                    "indexed": false,
-                    "name": "_to",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "name": "_amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "RewardStatus",
-            "type": "event"
-        },
-        {
-            "anonymous": false,
-            "inputs": [
-                {
-                    "indexed": false,
-                    "name": "_msg",
-                    "type": "string"
-                },
-                {
-                    "indexed": false,
-                    "name": "_id",
-                    "type": "uint256"
-                },
-                {
-                    "indexed": false,
-                    "name": "_to",
-                    "type": "address"
-                },
-                {
-                    "indexed": false,
-                    "name": "_amount",
-                    "type": "uint256"
-                }
-            ],
-            "name": "ErrorStatus",
-            "type": "event"
-        }
-    ]
-}
\ No newline at end of file
+{"token address":"0xdA8ebD32249C71d9F0a0749f591fbe9805BA243D","token owner":"0xD5a83F9fce3e7657151064f08135bFd1b9cb5FFa","token abi":[{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"}],"name":"approve","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"totalSupply","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_subtractedValue","type":"uint256"}],"name":"decreaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"renounceOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"symbol_","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_addedValue","type":"uint256"}],"name":"increaseApproval","outputs":[{"name":"","type":"bool"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_owner","type":"address"},{"name":"_spender","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"name_","outputs":[{"name":"","type":"string"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"decimals_","outputs":[{"name":"","type":"uint8"}],"payable":false,"stateMutability":"view","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"}],"name":"OwnershipRenounced","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"previousOwner","type":"address"},{"indexed":true,"name":"newOwner","type":"address"}],"name":"OwnershipTransferred","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"owner","type":"address"},{"indexed":true,"name":"spender","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Approval","type":"event"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}],"bounty address":"0xFde9613e68357D08ee583F91Fbe245436B220020","bounty owner":"0x64cA912901bf88B98dD1B862DFb355C4182D9269","bounty abi":[{"constant":true,"inputs":[],"name":"getBalance","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"},{"name":"_tokenAddress","type":"address"}],"name":"withdrawFeeToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_bountyDuration","type":"uint256"}],"name":"setBountyDuration","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyDuration","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyBeneficiariesCount","type":"uint256"}],"name":"setBountyBeneficiariesCount","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":false,"inputs":[{"name":"_minBounty","type":"uint256"}],"name":"setMinBounty","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"}],"name":"createBounty","outputs":[],"payable":true,"stateMutability":"payable","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"},{"name":"_user","type":"address"},{"name":"_reward","type":"uint256"}],"name":"rewardUser","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyBeneficiariesCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"},{"name":"_tokenAddress","type":"address"}],"name":"createBountyERC20","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyDurationPosterAllowed","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"minBounty","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_tokenAddress","type":"address"},{"name":"_bountyFee","type":"uint256"}],"name":"setBountyFeeToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"bountyFee","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_tokenAddress","type":"address"},{"name":"_minBounty","type":"uint256"}],"name":"setMinBountyToken","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_tokenAddress","type":"address"}],"name":"getMinBountyToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_amount","type":"uint256"}],"name":"withdrawFee","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_tokenAddress","type":"address"}],"name":"getBountyFeeToken","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"bountyFeeCount","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"}],"name":"cancelBounty","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[{"name":"_bountyId","type":"uint256"}],"name":"getBounty","outputs":[{"name":"","type":"uint256"},{"name":"","type":"address"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"uint256"},{"name":"","type":"bool"},{"name":"","type":"bool"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_bountyId","type":"uint256"},{"name":"_users","type":"address[]"},{"name":"_rewards","type":"uint256[]"}],"name":"rewardUsers","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_msg","type":"string"},{"indexed":false,"name":"_id","type":"uint256"},{"indexed":false,"name":"_from","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"BountyStatus","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_msg","type":"string"},{"indexed":false,"name":"_id","type":"uint256"},{"indexed":false,"name":"_to","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"RewardStatus","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"_msg","type":"string"},{"indexed":false,"name":"_id","type":"uint256"},{"indexed":false,"name":"_to","type":"address"},{"indexed":false,"name":"_amount","type":"uint256"}],"name":"ErrorStatus","type":"event"}]}
\ No newline at end of file
diff --git a/deploy/deploy.js b/deploy/deploy.js
index 24e43f5..b880bde 100644
--- a/deploy/deploy.js
+++ b/deploy/deploy.js
@@ -69,7 +69,7 @@ async function main() {
         'bounty abi': JSON.parse(bountyABI)
     }
     let data = JSON.stringify(contracts);  
-    fs.writeFileSync('contracts.json', data);  
+    fs.writeFileSync('./deploy/contracts.json', data);  
 }   
 
 
diff --git a/html/index.html b/html/index.html
deleted file mode 100644
index 0f4a796..0000000
--- a/html/index.html
+++ /dev/null
@@ -1,249 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <link rel="stylesheet" href="./style.css">
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <!-- <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/milligram/1.2.3/milligram.min.css"> -->
-    <script src="http://code.jquery.com/jquery-3.3.1.min.js"></script>
-    <script language="javascript" type="text/javascript" src="./web3/dist/web3.min.js"></script>
-    <title>Document</title>
-    
-</head>
-<body>
-        <!-- <div>
-            <div id="branding">
-                <h1>BountyBG</h1>
-            </div>
-            <nav>
-                <ul>
-                    <li class="current"><a href="index.html">CREATE</a></li>
-                    <li><a href="admin.html">SETTINGS</a></li>
-                    <li><a href="token.html">TOKEN</a></li>
-                </ul>
-            </nav>
-        </div>    -->
-
-        <div class="header">
-            <a href="#default" class="logo">CompanyLogo</a>
-            <div class="header-right">
-                <a class="active" href="#home">CREATE</a>
-                <a href="#contact">SETTINGS</a>
-                <a href="#about">TOKEN</a>
-            </div>
-        </div>
-
-    <!-- <section>
-    <div class="container">
-        <div class="row">
-            <div class="col-25">
-                <h3>Post Bounty</h3>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-25">
-                <label>Token Address</label>
-            </div>
-            <div class="col-75">
-                <input type="text" id="tokenAddress" placeholder="Token Address">
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-25">
-                <label>Poster Address</label>
-            </div>
-            <div class="col-75">
-                <select id="posterAddress"></select>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-25">
-                <label>Bounty Amount</label>
-            </div>
-            <div class="col-75">
-                <input type="number" id="bointyAmount" placeholder="Bounty Amount">
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-25">
-                <label>Bounty Id</label>
-            </div>
-            <div class="col-75">
-                <input type="number" id="bountyId" placeholder="Bounty Id">
-            </div>
-        </div>
-        <div class="row">
-            <div>
-                <button id="create" class="button">Create</button>
-            </div>
-        </div> -->
-        
-            <!-- <div class="column">
-                <h3>Admin Panel</h3>
-                <div class="column">
-                    <div class="row">
-                        <div class="column">
-                            <label>Minimum Bounty</label>
-                            <input type="number" id="minBounty" placeholder="Minimum Bounty">
-                        </div>
-                        <div class="column">
-                            <label>Token Address</label>
-                            <input type="text" id="minFeeTokneAddress" placeholder="Token Address">
-                        </div>
-                    </div>
-                    <button id="setMinBounty">Set Min Bounty</button>
-                    <button id="getMinBounty">Get Min Bounty</button>
-                </div>
-                <div class="column">
-                    <div class="row">
-                        <div class="column">
-                            <label><br /></label>
-                            <label>Bounty Fee</label>
-                            <input type="number" id="bountyFee" placeholder="Bounty Fee">
-                        </div>
-                        <div class="column">
-                            <label><br /></label>
-                            <label>Token Address</label>
-                            <input type="text" id="bountyFeeTokenAddress" placeholder="Token Address">
-                        </div>
-                    </div>
-                    <button id="setBountyFee">Set Bounty Fee</button>
-                    <button id="getBountyFee">Get Bounty Fee</button>
-                </div>
-            </div> -->
-        <!-- </div> -->
-    <!-- </div>
-    </section> -->
-
-    <script>
-        var bountyABI;
-        var bountyAddress;
-        var bountyOwner;
-        var tokenABI;
-        var tokenAddress;
-        var tokenOwner;
-
-        var bountyBG;
-        var token;
-
-        var el = function (id) { return document.querySelector(id); };
-        
-        web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545"));
-
-        main() 
-
-        el("#create").addEventListener("click", async function() {
-            await createERC20Bounty(el('#posterAddress').value, el('#tokenAddress').value, el('#bountyId').value)
-        })
-
-        el("#setMinBounty").addEventListener("click", async function() {
-            await setMinBounty(el('#minFeeTokneAddress').value, el('#minBounty').value)
-        })
-
-        el("#getMinBounty").addEventListener("click", async function() {
-            const minBounty = await getMinBounty(el('#minFeeTokneAddress').value)
-            console.log(minBounty)
-        })
-
-        el("#setBountyFee").addEventListener("click", async function() {
-            await setBountyFee(el('#bountyFeeTokenAddress').value, el('#bountyFee').value)
-        })
-
-        el("#getBountyFee").addEventListener("click", async function() {
-            bountyFee = await getBountyFee(el('#bountyFeeTokenAddress').value)
-            console.log(bountyFee)
-        })
-
-        function fillPosterAccounts() {
-            return new Promise((resolve, reject) => {
-                web3.eth.getAccounts()
-                .then((accounts) => {
-                    accounts.forEach(address => {
-                    posterAddress.innerHTML += '<option value="' + address + '">'
-                    + address + '</option>';
-                    })
-                })
-                resolve(true);
-            })
-        }
-
-        function createERC20Bounty(_bountyPoster, _tokenAddress, _bountyId) {
-            return new Promise((resolve, reject) => {
-                bountyBG.methods
-                .createBountyERC20(_bountyId, _tokenAddress)
-                .send({from: _bountyPoster, gas: 3000000})
-                .then()
-            })
-        }
-
-        function readContract() {
-            return new Promise((resolve, reject) => {
-                $.getJSON('./deploy/contracts.json', function(data) {
-                    resolve(data)
-                })
-            })
-        }
-
-        function setMinBounty(_tokenAddress, _minBounty) {
-            return new Promise((resolve, reject) => {
-                bountyBG.methods
-                .setMinBountyToken(_tokenAddress, _minBounty)
-                .send({from: bountyOwner, gas: 3000000})
-                .then()
-            })
-        }
-
-        function getMinBounty(tokenAddress) {
-            return new Promise((resolve, reject) => {
-                bountyBG.methods
-                .getMinBountyToken(tokenAddress)
-                .call()
-                .then(resolve)
-            })
-        }
-
-        function setBountyFee(_tokenAddress, _bountyFee) {
-            return new Promise((resolve, reject) => {
-                bountyBG.methods
-                .setBountyFeeToken(_tokenAddress, _bountyFee)
-                .send({from: bountyOwner, gas: 3000000})
-                .on('error', reject)
-                .then(resolve)
-            })
-        }
-
-        function getBountyFee(tokenAddress) {
-            return new Promise((resolve, reject) => {
-                bountyBG.methods
-                .getBountyFeeToken(tokenAddress)
-                .call()
-                .then(resolve)
-            })
-        }
-
-        async function main() {
-            const data = await readContract();
-            bountyABI = data['bounty abi'];
-            bountyAddress = data['bounty address']
-            bountyOwner = data['bounty owner']
-            tokenABI = data['token abi']
-            tokenAddress = data['token address']
-            tokenOwner = data['token owner']
-
-            bountyBG = new web3.eth.Contract(bountyABI, bountyAddress);
-            token = new web3.eth.Contract(tokenABI, tokenAddress);
-
-            await fillPosterAccounts();
-        
-            $('#bountyFeeTokenAddress').val(tokenAddress)
-            $('#minFeeTokneAddress').val(tokenAddress)
-            $('#tokenAddress').val(tokenAddress)
-
-        }
-        
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/token.html b/token.html
index 74834d2..ebc92b0 100644
--- a/token.html
+++ b/token.html
@@ -18,4 +18,117 @@
             <a class="active" href="#token.html">TOKEN</a>
         </div>
     </div>
+    <div class="container">
+        <h1>ERC20 TOKEN</h1>
+        <div class="column">
+            <div class="row">
+                <div class="col-25">
+                    <label>Token Address</label>
+                </div>
+                <div class="col-75">
+                    <input type="text" id="tokenAddress" placeholder="Token Address">
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-25">
+                <label>Current User</label>
+            </div>
+            <div class="col-75">
+                <select id="currentUser"></select>
+            </div>
+        </div>
+    </div>
+    <br />
+    <div class="container">
+        <h2>APPROVE</h2>
+        <div class="column">
+            <div class="row">
+                <div class="col-25">
+                    <label>Spender Address</label>
+                </div>
+                <div class="col-75">
+                    <input type="text" id="spenderAddress" placeholder="Spender Address">
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-25">
+                    <label>Token Amount</label>
+                </div>
+                <!-- <div class="col-25"> -->
+                    <input type="text" id="tokenAmount" placeholder="token Amount">
+                    <button id="approve">Approve</button>
+                    <button id="allowance">Allowance</button>
+                <!-- </div> -->
+            </div>
+        </div>
+    </div>
+
+
+    <script>
+        var tokenABI;
+        var tokenAddress;
+        var tokenOwner;
+        var bountyAddress;
+
+        var bountyBG;
+        var token;
+
+        var el = function (id) { return document.querySelector(id); };
+        
+        web3 = new Web3(new Web3.providers.HttpProvider("http://localhost:8545"));
+
+        el('#approve').addEventListener('click', async () => {
+            await token.methods
+            .approve(el('#spenderAddress').value, el('#tokenAmount').value)
+            .send({from: el('#currentUser').value, gas: 3000000});
+        })
+
+        el('#allowance').addEventListener('click', async () => {
+            const allowance = await token.methods
+            .allowance(el('#currentUser').value, el('#spenderAddress').value)
+            .call();
+            console.log(allowance)
+        })
+
+        function fillCurrentUser() {
+            return new Promise((resolve, reject) => {
+                web3.eth.getAccounts()
+                .then((accounts) => {
+                    accounts.forEach(address => {
+                    currentUser.innerHTML += '<option value="' + address + '">'
+                    + address + '</option>';
+                    })
+                })
+                resolve(true);
+            })
+        }
+
+        function readContract() {
+            return new Promise((resolve, reject) => {
+                $.getJSON('./deploy/contracts.json', function(data) {
+                    resolve(data)
+                })
+            })
+        }
+
+        async function main() {
+            const data = await readContract();
+            bountyAddress = data['bounty address']
+            tokenABI = data['token abi']
+            tokenAddress = data['token address']
+            tokenOwner = data['token owner']
+
+            token = new web3.eth.Contract(tokenABI, tokenAddress);
+
+            await fillCurrentUser();
+        
+            $('#tokenAddress').val(tokenAddress);
+            $('#spenderAddress').val(bountyAddress);
+        }
+        
+        main();
+
+    </script>
+
 </body>
\ No newline at end of file