Layout fix and list comprehension update