Better fix the YES/OK/No button sizing and code cleanup