Fix spacing under Add buttons
Full rewrite of puller