Clean up and address duplicate buttons