Arrow buttons now enable/disable as expected