General overhaul of matrix button.