Small improvements

There is no ImageView anymore, see previous comment