Further changes to layout and ListAdapter