Add improvements on layout for lists and images