Improve buttons for retro index