Card #479 - more explicit left/right button handling