diff --git a/packages/native-core/Cargo.toml b/packages/native-core/Cargo.toml
index 09c08bc61..496faa893 100644
--- a/packages/native-core/Cargo.toml
+++ b/packages/native-core/Cargo.toml
@@ -15,12 +15,13 @@ dioxus-core = { path = "../core", version = "^0.2.1" }
 dioxus-html = { path = "../html", version = "^0.2.1" }
 dioxus-core-macro = { path = "../core-macro", version = "^0.2.1" }
 
-taffy = "0.1.0"
+taffy = "0.2.0"
 smallvec = "1.6"
 rustc-hash = "1.1.0"
 anymap = "0.12.1"
 slab = "0.4"
 parking_lot = "0.12.1"
+crossbeam-deque = "0.8.2"
 
 [dev-dependencies]
 rand = "0.8.5"
\ No newline at end of file
diff --git a/packages/native-core/src/layout_attributes.rs b/packages/native-core/src/layout_attributes.rs
index da23e937f..b59177e4e 100644
--- a/packages/native-core/src/layout_attributes.rs
+++ b/packages/native-core/src/layout_attributes.rs
@@ -343,14 +343,14 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
         "border-left" => {}
         "border-left-color" => {}
         "border-left-style" => {
-            if style.border.start == Dimension::default() {
+            if style.border.left == Dimension::default() {
                 let v = Dimension::Points(1.0);
-                style.border.start = v;
+                style.border.left = v;
             }
         }
         "border-left-width" => {
             if let Some(v) = parse_value(value) {
-                style.border.start = v;
+                style.border.left = v;
             }
         }
         "border-radius" => {}
@@ -358,11 +358,11 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
         "border-right-color" => {}
         "border-right-style" => {
             let v = Dimension::Points(1.0);
-            style.border.end = v;
+            style.border.right = v;
         }
         "border-right-width" => {
             if let Some(v) = parse_value(value) {
-                style.border.end = v;
+                style.border.right = v;
             }
         }
         "border-spacing" => {}
@@ -375,13 +375,13 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
                 let v = Dimension::Points(1.0);
                 style.border.bottom = v;
             }
-            if style.border.start == Dimension::default() {
+            if style.border.left == Dimension::default() {
                 let v = Dimension::Points(1.0);
-                style.border.start = v;
+                style.border.left = v;
             }
-            if style.border.end == Dimension::default() {
+            if style.border.right == Dimension::default() {
                 let v = Dimension::Points(1.0);
-                style.border.end = v;
+                style.border.right = v;
             }
         }
         "border-top" => {}
@@ -404,8 +404,8 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
             if values.len() == 1 {
                 if let Some(dim) = parse_value(values[0]) {
                     style.border = Rect {
-                        start: dim,
-                        end: dim,
+                        right: dim,
+                        left: dim,
                         top: dim,
                         bottom: dim,
                     };
@@ -414,8 +414,8 @@ fn apply_border(name: &str, value: &str, style: &mut Style) {
                 let border_widths = [
                     &mut style.border.top,
                     &mut style.border.bottom,
-                    &mut style.border.start,
-                    &mut style.border.end,
+                    &mut style.border.left,
+                    &mut style.border.right,
                 ];
                 for (v, width) in values.into_iter().zip(border_widths) {
                     if let Some(w) = parse_value(v) {
@@ -512,12 +512,12 @@ fn apply_padding(name: &str, value: &str, style: &mut Style) {
             "padding" => {
                 style.padding.top = v;
                 style.padding.bottom = v;
-                style.padding.start = v;
-                style.padding.end = v;
+                style.padding.left = v;
+                style.padding.right = v;
             }
             "padding-bottom" => style.padding.bottom = v,
-            "padding-left" => style.padding.start = v,
-            "padding-right" => style.padding.end = v,
+            "padding-left" => style.padding.left = v,
+            "padding-right" => style.padding.right = v,
             "padding-top" => style.padding.top = v,
             _ => {}
         }
@@ -578,13 +578,13 @@ fn apply_margin(name: &str, value: &str, style: &mut Style) {
             "margin" => {
                 style.margin.top = dim;
                 style.margin.bottom = dim;
-                style.margin.start = dim;
-                style.margin.end = dim;
+                style.margin.left = dim;
+                style.margin.right = dim;
             }
             "margin-top" => style.margin.top = dim,
             "margin-bottom" => style.margin.bottom = dim,
-            "margin-left" => style.margin.start = dim,
-            "margin-right" => style.margin.end = dim,
+            "margin-left" => style.margin.left = dim,
+            "margin-right" => style.margin.right = dim,
             _ => {}
         }
     }