improve flash messages