more btn fixes