Added autofill button and function