Changed from LinearLayout to TableLayout