Added custom re/shuff buttons