Removed Pair class, this already exists.
Fixed saving and click listeners