some btn fixes and unification