Small improvements

I replaced the LinearLayout that contained both the TextView and The ImageView with a single TextView (compound drawable), so ImageView doesn't exist anymore. If we wanted to hide the image we can just set the drawable of the textview to null.