some btn fixes