Try to fix buttons again