Improve UI consistency, add more params to form