diff --git a/src/org/nativescript/widgets/DockLayout.java b/src/org/nativescript/widgets/DockLayout.java
index 5d27737c0..405b57cc3 100644
--- a/src/org/nativescript/widgets/DockLayout.java
+++ b/src/org/nativescript/widgets/DockLayout.java
@@ -11,9 +11,9 @@ import android.view.View;
  *
  */
 public class DockLayout extends LayoutBase {
-
-    private boolean _stretchLastChild = true;
     
+    private boolean _stretchLastChild = true;
+
 	public DockLayout(Context context) {
 		super(context);
 	}
diff --git a/src/org/nativescript/widgets/GridLayout.java b/src/org/nativescript/widgets/GridLayout.java
index 0c242ec10..0aa608967 100644
--- a/src/org/nativescript/widgets/GridLayout.java
+++ b/src/org/nativescript/widgets/GridLayout.java
@@ -700,10 +700,12 @@ class MeasureHelper {
 
 		this.columnStarValue = columnStarCount > 0 ? (this.width - currentColumnWidth) / columnStarCount : 0;
 
-		for(int i = 0; i < columnCount; i++) {
-			ItemGroup item = this.columns.get(i);	        	
-			if (item.getIsStar()) {
-				item.length = item.rowOrColumn.getValue() * this.columnStarValue;
+		if (this.stretchedHorizontally) {
+			for (int i = 0; i < columnCount; i++) {
+				ItemGroup item = this.columns.get(i);
+				if (item.getIsStar()) {
+					item.length = item.rowOrColumn.getValue() * this.columnStarValue;
+				}
 			}
 		}
 	}
@@ -725,12 +727,14 @@ class MeasureHelper {
 
 		this.rowStarValue = rowStarCount > 0 ? (this.height - currentRowHeight) / rowStarCount : 0;
 
-		for(int i = 0; i < rowCount; i++) {
-			ItemGroup item = this.rows.get(i);	        	
-			if (item.getIsStar()) {
-				item.length = item.rowOrColumn.getValue() * this.rowStarValue;
-			}
-		}
+        if(this.stretchedVertically) {
+            for (int i = 0; i < rowCount; i++) {
+                ItemGroup item = this.rows.get(i);
+                if (item.getIsStar()) {
+                    item.length = item.rowOrColumn.getValue() * this.rowStarValue;
+                }
+            }
+        }
 	}
 
 	private void fakeMeasure() {
diff --git a/src/org/nativescript/widgets/LayoutBase.java b/src/org/nativescript/widgets/LayoutBase.java
index 3f504485b..aa5d10cba 100644
--- a/src/org/nativescript/widgets/LayoutBase.java
+++ b/src/org/nativescript/widgets/LayoutBase.java
@@ -20,7 +20,6 @@ public abstract class LayoutBase extends ViewGroup {
 		super(context);
 	}
 
-	
     @Override
     protected LayoutParams generateDefaultLayoutParams() {
         return new CommonLayoutParams();
diff --git a/src/org/nativescript/widgets/TabItemSpec.java b/src/org/nativescript/widgets/TabItemSpec.java
index dc6881f71..16bc1e021 100644
--- a/src/org/nativescript/widgets/TabItemSpec.java
+++ b/src/org/nativescript/widgets/TabItemSpec.java
@@ -6,4 +6,4 @@ public class TabItemSpec {
     public String title;
     public int iconId;
     public Drawable iconDrawable;
-}
\ No newline at end of file
+}
diff --git a/src/org/nativescript/widgets/TabStrip.java b/src/org/nativescript/widgets/TabStrip.java
index c400bda3c..700d48fc0 100644
--- a/src/org/nativescript/widgets/TabStrip.java
+++ b/src/org/nativescript/widgets/TabStrip.java
@@ -27,7 +27,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 class TabStrip extends LinearLayout {
-
+    
     private static final int DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS = 0;
     private static final byte DEFAULT_BOTTOM_BORDER_COLOR_ALPHA = 0x26;
     private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 3;
diff --git a/src/org/nativescript/widgets/WrapLayout.java b/src/org/nativescript/widgets/WrapLayout.java
index a660aeeee..a9d2d1b7e 100644
--- a/src/org/nativescript/widgets/WrapLayout.java
+++ b/src/org/nativescript/widgets/WrapLayout.java
@@ -21,7 +21,7 @@ public class WrapLayout extends LayoutBase {
 	public WrapLayout(Context context) {
 		super(context);
 	}	
-	
+    
 	public Orientation getOrientation() {
 	    return this._orientation;
 	}