Revert "change form and  button"

This reverts commit 8f3d14fd84bba1c52ff513286daa546ecffd2279.
Revert "Revert "change form and  button""

This reverts commit 908ff102bd1df9e9787378f76ade00fa0020e9a1.
Revert "improve user timeout calculation"

This reverts commit 6ec8c48d65cfbb7fcce450eab080ba2fecd2de89.
Revert "Revert "improve user timeout calculation""

This reverts commit 06e8f18c43ae014a5a97d12bff57937e0c3c201e.
fix timeout function error