fix names, add form autofocus