Fix styles for main number buttons, and adjust JS