Add support for 2d pairs
Fit at many 2d pairs as we can
Code consistency & formatting updates
Add keyboard toggle of name & bg bars display