fixing recoverybutton index & adding focus