Cherry Switch dimension is 14.3 mm x 14.3 mm when using a CAD program to cut-out holes for it.
Adding the OLED display seemed to change the impedence slightly for the button array and the code was excuting ALL of the button code and really slow down things. After a tweak of the code to ignore, things started working again.