bug fix
add action attributes
Complete save flow