Added bootstrap modal & save / cancel