Flash message improvements