Added autofocus to appropriate fields