Cleaned up the pins scaffold and updated form