fix buttons issue