Fixing tab highlighting issues