Fixed Issue #4 - Tab Hightlight Issue