modified tab index and default focus

modified tab index and default focus