Fixing pinlist styling
Fixing merge conflict