refined buttons
Auto-advance works better now