0bb6747 Fix more buttons