Fixed angular imports and reformat in list/list