extend timeout and fix flash msgs popup twice