A new layout for the pairing page

This should be easier to use and clearer for users