Issue #503 Enhancements with flash messages