issue buttons fix