Reorganized the new smaller buttons on all panels