Flash messages improved