Added pins scaffold and cleaned up layout