Fixed default-btn button bugs