Code cleanup, new ListItemView, header image