Restructure some buttons