removing extra buttons and adding back alerts removed from merge