Finalized changes to pins scaffold