fixing tab issue, shortcuts modified