Remove duplicate tooltip and add buttons