Update default timeout. Update layout