Match overflow menu button and button
Fix infinite loop by using index