diff --git a/java/res/layout/candidate.xml b/java/res/layout/candidate.xml
index aa2845f..8437bf9 100644
--- a/java/res/layout/candidate.xml
+++ b/java/res/layout/candidate.xml
@@ -18,31 +18,14 @@
 */
 -->
 
-<LinearLayout
+<Button
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
-    android:orientation="horizontal"
->
-    <Button
-        android:id="@+id/candidate_word"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:minWidth="@dimen/candidate_min_width"
-        android:textSize="@dimen/candidate_text_size"
-        android:textColor="@color/candidate_normal"
-        android:focusable="true"
-        android:clickable="true"
-        android:gravity="center_vertical|center_horizontal"
-        style="?attr/suggestionBackgroundStyle" />
-    <TextView
-        android:id="@+id/candidate_debug_info"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:visibility="gone"
-        android:textSize="10dip"
-        android:textColor="#ff808080"
-        android:focusable="false"
-        android:clickable="false"
-        android:gravity="bottom" />
-</LinearLayout>
+    android:minWidth="@dimen/candidate_min_width"
+    android:textSize="@dimen/candidate_text_size"
+    android:textColor="@color/candidate_typed_word"
+    android:focusable="true"
+    android:clickable="true"
+    android:gravity="center_vertical|center_horizontal"
+    style="?attr/suggestionBackgroundStyle" />
diff --git a/java/res/layout/candidate_divider.xml b/java/res/layout/candidate_divider.xml
index dc6738a..1d75e52 100644
--- a/java/res/layout/candidate_divider.xml
+++ b/java/res/layout/candidate_divider.xml
@@ -20,7 +20,6 @@
 
 <ImageView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/candidate_divider"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:src="@drawable/keyboard_suggest_strip_divider"