Updated trimming and aligning of lists