close #327
made the add/remove button flash messages less condition specific