Added new buttons, cleaned up pins scaffold