unifying buttons (fix bugs)