diff --git a/.bitmap b/.bitmap
index 3f738f3..d05382f 100644
--- a/.bitmap
+++ b/.bitmap
@@ -252,14 +252,14 @@
     "guya-ltd.gcss/molecules/hero@0.0.2": {
         "files": [
             {
+                "name": "Hero.js",
                 "relativePath": "src/components/molecules/Hero/Hero.js",
-                "test": false,
-                "name": "Hero.js"
+                "test": false
             },
             {
+                "name": "index.js",
                 "relativePath": "src/components/molecules/Hero/index.js",
-                "test": false,
-                "name": "index.js"
+                "test": false
             }
         ],
         "mainFile": "src/components/molecules/Hero/index.js",
@@ -323,14 +323,14 @@
     "guya-ltd.gcss/molecules/nav@0.0.3": {
         "files": [
             {
+                "name": "Nav.js",
                 "relativePath": "src/components/molecules/Nav/Nav.js",
-                "test": false,
-                "name": "Nav.js"
+                "test": false
             },
             {
+                "name": "index.js",
                 "relativePath": "src/components/molecules/Nav/index.js",
-                "test": false,
-                "name": "index.js"
+                "test": false
             }
         ],
         "mainFile": "src/components/molecules/Nav/index.js",
@@ -338,47 +338,47 @@
         "origin": "AUTHORED",
         "exported": true
     },
-    "guya-ltd.gcss/molecules/navbar@0.0.6": {
+    "guya-ltd.gcss/molecules/navbar@0.0.7": {
         "files": [
             {
+                "name": "Navbar.js",
                 "relativePath": "src/components/molecules/Navbar/Navbar.js",
-                "test": false,
-                "name": "Navbar.js"
+                "test": false
             },
             {
+                "name": "NavbarBrand.js",
                 "relativePath": "src/components/molecules/Navbar/__Brand/NavbarBrand.js",
-                "test": false,
-                "name": "NavbarBrand.js"
+                "test": false
             },
             {
+                "name": "NavbarBrandLarge.js",
                 "relativePath": "src/components/molecules/Navbar/__Brand/__Large/NavbarBrandLarge.js",
-                "test": false,
-                "name": "NavbarBrandLarge.js"
+                "test": false
             },
             {
+                "name": "NavbarBrandSmall.js",
                 "relativePath": "src/components/molecules/Navbar/__Brand/__Small/NavbarBrandSmall.js",
-                "test": false,
-                "name": "NavbarBrandSmall.js"
+                "test": false
             },
             {
+                "name": "NavbarMenu.js",
                 "relativePath": "src/components/molecules/Navbar/__Menu/NavbarMenu.js",
-                "test": false,
-                "name": "NavbarMenu.js"
+                "test": false
             },
             {
+                "name": "NavbarMenuLeft.js",
                 "relativePath": "src/components/molecules/Navbar/__Menu/__Left/NavbarMenuLeft.js",
-                "test": false,
-                "name": "NavbarMenuLeft.js"
+                "test": false
             },
             {
+                "name": "NavbarMenuRight.js",
                 "relativePath": "src/components/molecules/Navbar/__Menu/__Right/NavbarMenuRight.js",
-                "test": false,
-                "name": "NavbarMenuRight.js"
+                "test": false
             },
             {
+                "name": "index.js",
                 "relativePath": "src/components/molecules/Navbar/index.js",
-                "test": false,
-                "name": "index.js"
+                "test": false
             }
         ],
         "mainFile": "src/components/molecules/Navbar/index.js",
@@ -417,17 +417,17 @@
         "origin": "AUTHORED",
         "exported": true
     },
-    "guya-ltd.gcss/molecules/pricetable@0.0.2": {
+    "guya-ltd.gcss/molecules/pricetable@0.0.4": {
         "files": [
             {
+                "name": "PriceTable.js",
                 "relativePath": "src/components/molecules/PriceTable/PriceTable.js",
-                "test": false,
-                "name": "PriceTable.js"
+                "test": false
             },
             {
+                "name": "index.js",
                 "relativePath": "src/components/molecules/PriceTable/index.js",
-                "test": false,
-                "name": "index.js"
+                "test": false
             }
         ],
         "mainFile": "src/components/molecules/PriceTable/index.js",
@@ -670,17 +670,17 @@
         "origin": "AUTHORED",
         "exported": true
     },
-    "guya-ltd.gcss/templates/xpresshome@0.0.3": {
+    "guya-ltd.gcss/templates/xpresshome@0.0.4": {
         "files": [
             {
+                "name": "XpressHome.js",
                 "relativePath": "src/components/templates/XpressHome/XpressHome.js",
-                "test": false,
-                "name": "XpressHome.js"
+                "test": false
             },
             {
+                "name": "index.js",
                 "relativePath": "src/components/templates/XpressHome/index.js",
-                "test": false,
-                "name": "index.js"
+                "test": false
             }
         ],
         "mainFile": "src/components/templates/XpressHome/index.js",
diff --git a/src/components/molecules/Navbar/Navbar.js b/src/components/molecules/Navbar/Navbar.js
index de0c3f4..ffc78ee 100644
--- a/src/components/molecules/Navbar/Navbar.js
+++ b/src/components/molecules/Navbar/Navbar.js
@@ -76,7 +76,7 @@ class Navbar extends Component {
                                 {collapse.left}
                             </div>
                             <div class='col-xs'>
-                                <div class='row end-xs'>
+                                <div class='row end-md'>
                                     <div class='navbar__collapse__search'>
                                         {collapse.search}
                                     </div>
diff --git a/src/components/molecules/PriceTable/PriceTable.js b/src/components/molecules/PriceTable/PriceTable.js
index 450a1ad..9ad0fad 100644
--- a/src/components/molecules/PriceTable/PriceTable.js
+++ b/src/components/molecules/PriceTable/PriceTable.js
@@ -19,7 +19,23 @@ import PropTypes from 'prop-types';
 
 class PriceTable extends Component {
     render() {
-        const{title, lists}=this.props;
+        const{
+            title, 
+            lists, 
+            sign, 
+            locale,
+            weight_name,
+            weight_unit,
+            length_name,
+            length_unit,
+            width_name,
+            width_unit,
+            height_name,
+            height_unit,
+            href,
+            text,
+            per
+        }=this.props;
         return(
             <div id="generic_price_table" style={{background: "#eee"}}>   
                 <section>
@@ -48,19 +64,20 @@ class PriceTable extends Component {
                                                     {/* HEADER START */}
                                                     <div className="head_bg" />
                                                     <div className="head">
-                                                        <span>{list.name}</span>
+                                                        <span>{list['name_' + locale]}</span>
                                                     </div>
                                                     {/* HEADER END */}
                                                 </div>
                                                 {/* HEADER CONTENT END */}
 
                                                 {/* PRICE START */}
+                                                
                                                 <div className="generic_price_tag clearfix">
                                                     <span className="price">
-                                                        <span className="sign">{list.sign && "Birr"}</span>
-                                                        <span className="currency">{list.currency}</span>
-                                                        <span className="cent">{list.cent}</span>
-                                                        <span className="month">{list.per && "/Km"}</span>
+                                                        <span className="sign">{sign && "Birr"}</span>
+                                                        <span className="currency">{list.price.toString().split(".")[0]}</span>
+                                                        <span className="cent">{list.price.toString().split(".")[1]}</span>
+                                                        <span className="month">{per && "/Km"}</span>
                                                     </span>
                                                 </div>
                                                 {/* PRICE END */}
@@ -70,20 +87,17 @@ class PriceTable extends Component {
                                             {/* FEATURE LIST START */}
                                             <div className="generic_feature_list">
                                                 <ul>
-                                                    {
-                                                        list.features.map((feature) => {
-                                                            return(
-                                                            <li><span>{feature.value}</span> {feature.name}</li>
-                                                            )
-                                                        })
-                                                    }
+                                                    <li><span>{weight_name}</span> {list.weight}{weight_unit}</li>
+                                                    <li><span>{length_name}</span> {list.length}{length_unit}</li>
+                                                    <li><span>{width_name}</span>  {list.width}{width_unit}</li>
+                                                    <li><span>{height_name}</span> {list.height}{height_unit}</li>
                                                 </ul>
                                             </div>
                                             {/* FEATURE LIST END */}
 
                                             {/* BUTTON START */}
                                             <div className="generic_price_btn clearfix">
-                                                <a className="" href={list.href}>{list.text}</a>
+                                                <a className="" href={href}>{text}</a>
                                             </div>
                                             {/* BUTTON END */}
                                         </div>
diff --git a/src/components/templates/XpressHome/XpressHome.js b/src/components/templates/XpressHome/XpressHome.js
index 4801d59..441f012 100644
--- a/src/components/templates/XpressHome/XpressHome.js
+++ b/src/components/templates/XpressHome/XpressHome.js
@@ -21,7 +21,7 @@ import { withNaming } from '@bem-react/classname';
 class XpressHome extends Component {
     render() {
         /* Props */
-        const{bsPrefix, header, hero, track, footer, pricing} = this.props;
+        const{bsPrefix, header, hero, track, footer, children} = this.props;
         
         return(
             <div>
@@ -44,7 +44,7 @@ class XpressHome extends Component {
                 </div>
                 <div className="">
                     {/* Pricing Table */}
-                    {pricing}
+                    {children}
                 </div>
                 {footer}
             </div>