Modified to remove innner LinearLayout