TAB navigation bug fixed