Moved edit save confirmation to flash message
simplified flash messages
Merge branch 'SaveFlash'