Add timeout attribute and improved show/hide facility