Buttons have increased functionality, but reordering still is buggy