Show feedback on save
Fix activity toggling