diff --git a/src/modules/main/logViewer/logViewer.css b/src/modules/main/logViewer/logViewer.css
index 8cf777d..7e94af7 100644
--- a/src/modules/main/logViewer/logViewer.css
+++ b/src/modules/main/logViewer/logViewer.css
@@ -8,6 +8,14 @@ a {
     overflow: visible;
     z-index: 10;
 }
+
+.search-res {
+    background-color: rgb(250, 255, 189);
+}
+
+.search-res-focus {
+    background-color: yellow;
+}
 :host {
     --dxp-s-form-element-text-font-size: 0.75rem;
     --dxp-s-button-font-size: 0.8125rem;
diff --git a/src/modules/main/logViewer/logViewer.html b/src/modules/main/logViewer/logViewer.html
index 6b0cca1..ec66434 100644
--- a/src/modules/main/logViewer/logViewer.html
+++ b/src/modules/main/logViewer/logViewer.html
@@ -49,28 +49,11 @@ <h1>
                                                 <div
                                                     class="slds-m-left--xx-small search-button"
                                                 >
-                                                    <div
-                                                        class="slds-button-group actionBarButtonGroup"
-                                                        role="group"
-                                                    >
-                                                        <button
-                                                            class="slds-button slds-button_neutral action-bar-action-inlineEditReport reportAction report-action-inlineEditReport filtersButton"
-                                                            type="button"
-                                                        >
-                                                            <svg
-                                                                aria-hidden="true"
-                                                                class="slds-button__icon slds-button__icon_left"
-                                                                viewBox="0 0 52 52"
-                                                            >
-                                                                <g>
-                                                                    <path
-                                                                        d="M9.5 33.4l8.9 8.9c.4.4 1 .4 1.4 0L42 20c.4-.4.4-1 0-1.4l-8.8-8.8c-.4-.4-1-.4-1.4 0L9.5 32.1c-.4.4-.4 1 0 1.3zM36.1 5.7c-.4.4-.4 1 0 1.4l8.8 8.8c.4.4 1 .4 1.4 0l2.5-2.5c1.6-1.5 1.6-3.9 0-5.5l-4.7-4.7c-1.6-1.6-4.1-1.6-5.7 0l-2.3 2.5zM2.1 48.2c-.2 1 .7 1.9 1.7 1.7l10.9-2.6c.4-.1.7-.3.9-.5l.2-.2c.2-.2.3-.9-.1-1.3l-9-9c-.4-.4-1.1-.3-1.3-.1l-.2.2c-.3.3-.4.6-.5.9L2.1 48.2z"
-                                                                    ></path>
-                                                                </g></svg
-                                                            >Enable Field
-                                                            Editing
-                                                        </button>
-                                                    </div>
+                                                    <ui-input
+                                                        has-label={goTohasLabel}
+                                                        placeholder={goToPlaceholder}
+                                                        oninputchange={goToLine}
+                                                    ></ui-input>
                                                 </div>
                                                 <div
                                                     class="slds-m-left--xx-small"
@@ -87,7 +70,9 @@ <h1>
                                                                 line-height: 1;
                                                             "
                                                         >
-                                                            <div>
+                                                            <div
+                                                                class="search-button"
+                                                            >
                                                                 <div
                                                                     role="button"
                                                                     tabindex="-1"
@@ -117,7 +102,7 @@ <h1>
                                                 <div
                                                     class="slds-m-left--xx-small"
                                                 >
-                                                    <div
+                                                    <!-- <div
                                                         class="slds-button-group actionBarButtonGroup"
                                                         role="group"
                                                     >
@@ -139,7 +124,7 @@ <h1>
                                                                 ></path></svg
                                                             >Add Chart
                                                         </button>
-                                                    </div>
+                                                    </div> -->
                                                 </div>
                                                 <div
                                                     class="slds-m-left--xx-small"
@@ -645,8 +630,9 @@ <h1>
                                                                                             <ui-search
                                                                                                 onclosesearch={handleSearch}
                                                                                                 logtobe-filtered={fileData}
-                                                                                                onnextmatch={goToNxtMatch}
-                                                                                                onprevmatch={goToPrevMatch}
+                                                                                                onmatchchange={goToMatch}
+                                                                                                onsearchres={processSearchRes}
+                                                                                                onnores={processNoSearchRes}
                                                                                             ></ui-search>
                                                                                         </div>
                                                                                     </template>
@@ -733,6 +719,8 @@ <h1>
                                                                                         >
                                                                                             <tr
                                                                                                 key={lineObj.lineNumber}
+                                                                                                data-logid={lineObj.lineNumber}
+                                                                                                class="log-row"
                                                                                             >
                                                                                                 <td
                                                                                                     style="
diff --git a/src/modules/main/logViewer/logViewer.js b/src/modules/main/logViewer/logViewer.js
index b3c8395..55aa752 100644
--- a/src/modules/main/logViewer/logViewer.js
+++ b/src/modules/main/logViewer/logViewer.js
@@ -1,12 +1,16 @@
 /* eslint-disable inclusive-language/use-inclusive-words */
 import { LightningElement, track } from 'lwc';
-import { subscribe, publish } from 'services/pubsub';
+import { subscribe } from 'services/pubsub';
 
 export default class logViewer extends LightningElement {
+    goToPlaceholder = 'Go to line';
+    goTohasLabel = false;
     reRenderVal = false;
     isLoading = false;
     isSearching = false;
     callStackToggle = false;
+    LineNumMap = new Map();
+    LineNumFocus = null;
     fieldValue;
     operatorValue;
     filterValue = '';
@@ -163,7 +167,36 @@ export default class logViewer extends LightningElement {
                 const searchPopover =
                     this.template.querySelector('.data-search');
                 if (searchPopover) {
-                    searchPopover.style.left = `${searchButtonRect.right}px`;
+                    searchPopover.style.right = `${window.innerWidth - 24 - searchButtonRect.right}px`;
+                }
+            }
+            const lineElem = this.template.querySelectorAll('.log-row');
+            if (lineElem.length > 0) {
+                lineElem.forEach((ele) => {
+                    ele.style.backgroundColor = 'rgba(0, 0, 0, 0)';
+                });
+            }
+            if (this.LineNumMap.size > 0) {
+                if (this.LineNumMap.has(this.pageNumber)) {
+                    const highEle = this.LineNumMap.get(this.pageNumber);
+                    highEle.forEach((ele) => {
+                        const element = this.template.querySelector(
+                            `[data-logid="${ele}"]`
+                        );
+
+                        if (element) {
+                            if (this.LineNumFocus !== ele) {
+                                element.style.backgroundColor =
+                                    'rgb(250, 255, 189)';
+                            } else {
+                                element.style.backgroundColor = 'yellow';
+                                element.scrollIntoView({
+                                    behavior: 'smooth',
+                                    block: 'start'
+                                });
+                            }
+                        }
+                    });
                 }
             }
         }
@@ -174,52 +207,6 @@ export default class logViewer extends LightningElement {
         return this.activeFilters.length > 0;
     }
 
-    // subscribeToMessageChannel() {
-    // console.log("Subscribe called");
-    //    if (!this.logChannelSub) {
-    //        this.logChannelSub = subscribe(
-    //            this.messageContext,
-    //            STATE,
-    //            (message) => {
-    //                this.setFileData(message);
-    //            },
-    //            { scope: APPLICATION_SCOPE }
-    //        );
-    //        this.logChannelSub = true;
-    //    }
-    // }
-
-    // setFileData(message) {
-    //     if (message !== null && message !== undefined) {
-    //         // console.log("[LogPreviewer.js] setFileData called", message);
-    //         if (message.fileData !== undefined && message.fileData !== null) {
-    //             this.fileData = message.fileData;
-    //             this.pageNumber = 1;
-    //             this.noOfPages = Math.ceil(
-    //                 this.fileData.length / this.linesPerPage
-    //             );
-    //             this.calculations();
-    //         }
-    //         if (
-    //             message.fileMetadata !== undefined &&
-    //             message.fileMetadata !== null
-    //         ) {
-    //             this.fileMetadata = message.fileMetadata;
-    //         }
-    //         if (
-    //             message.eventsPicklistValues !== undefined &&
-    //             message.eventsPicklistValues !== null
-    //         ) {
-    //             if (Array.isArray(message.eventsPicklistValues)) {
-    //                 this.filterPickListMaster =
-    //                     message.eventsPicklistValues.map((str) => ({
-    //                         value: str,
-    //                         label: str
-    //                     }));
-    //             }
-    //         }
-    //     }
-    // }
     onLinesPerPageChange(event) {
         // console.log("Page Change: ", event.target.value);
         let input = parseInt(event.target.value, 10);
@@ -508,15 +495,65 @@ export default class logViewer extends LightningElement {
 
     handleSearch() {
         this.isSearching = !this.isSearching;
-        // const payload = this.fileData;
-        // publish('searchChannel', payload);
+        if (this.isSearching === false) {
+            this.processNoSearchRes();
+        }
+    }
+
+    processSearchRes(event) {
+        const lineNumbers = event.detail;
+        this.LineNumMap = new Map();
+        //console.log(lineNumbers);
+        if (Array.isArray(lineNumbers)) {
+            lineNumbers.forEach((l) => {
+                if (this.linesPerPage !== 0) {
+                    const pNum = Math.ceil(l / this.linesPerPage);
+                    if (this.LineNumMap.has(pNum)) {
+                        this.LineNumMap.get(pNum).push(l);
+                    } else {
+                        this.LineNumMap.set(pNum, [l]);
+                    }
+                }
+            });
+        }
+        // console.log('Map: ', this.LineNumMap);
     }
 
-    goToNxtMatch(event) {
-        console.log(event.detail);
+    goToMatch(event) {
+        const lineNumber = event.detail;
+        // console.log('lineNumber: ', lineNumber);
+        this.goToPage(lineNumber);
+    }
+
+    goToPage(lineNumber) {
+        //calculate the pagenumber
+        if (this.linesPerPage <= 0 || lineNumber <= 0) return;
+        this.LineNumFocus = lineNumber;
+        this.pageNumber = Math.ceil(lineNumber / this.linesPerPage);
+        this.calculations();
+    }
+
+    processNoSearchRes() {
+        this.LineNumFocus = null;
+        if (this.LineNumMap.size > 0) {
+            if (this.LineNumMap.has(this.pageNumber)) {
+                const highEle = this.LineNumMap.get(this.pageNumber);
+                highEle.forEach((ele) => {
+                    const element = this.template.querySelector(
+                        `[data-logid="${ele}"]`
+                    );
+                    if (element) {
+                        element.style.backgroundColor = 'rgba(0, 0, 0, 0)';
+                    }
+                });
+            }
+        }
+        this.LineNumMap = new Map();
     }
 
-    goToPrevMatch(event) {
-        console.log(event.detail);
+    goToLine(event) {
+        // console.log('linenumber', event.detail);
+        const lNum = event.detail;
+        this.goToPage(lNum);
     }
 }
diff --git a/src/modules/ui/input/input.html b/src/modules/ui/input/input.html
index a4ecf33..dec1478 100644
--- a/src/modules/ui/input/input.html
+++ b/src/modules/ui/input/input.html
@@ -1,15 +1,28 @@
 <template>
     <div class={inputClassList}>
-        <label class="slds-form-element__label slds-no-flex">{label}</label>
+        <template lwc:if={hasLabel}>
+            <label class="slds-form-element__label slds-no-flex">{label}</label>
+        </template>
         <div class="slds-form-element__control slds-grow">
-            <input
-                type="text"
-                minlength={minimumLength}
-                placeholder={placeholder}
-                class="slds-input"
-                value={textValue}
-                onchange={handleInputChange}
-            />
+            <template lwc:if={textValue}>
+                <input
+                    type="text"
+                    minlength={minimumLength}
+                    placeholder={placeholder}
+                    class="slds-input"
+                    value={textValue}
+                    onchange={handleInputChange}
+                />
+            </template>
+            <template lwc:else>
+                <input
+                    type="text"
+                    minlength={minimumLength}
+                    placeholder={placeholder}
+                    class="slds-input"
+                    oninput={handleOnInput}
+                />
+            </template>
         </div>
         <template if:true={hasError}>
             <div role="alert" class="slds-form-element__help">
diff --git a/src/modules/ui/input/input.js b/src/modules/ui/input/input.js
index c7d65c0..77943ae 100644
--- a/src/modules/ui/input/input.js
+++ b/src/modules/ui/input/input.js
@@ -5,6 +5,7 @@ export default class Input extends LightningElement {
     @api minimumLength;
     @api placeholder;
     @api textValue;
+    @api hasLabel;
     textValueInternal = '';
     @api type;
     hasError = false;
@@ -28,7 +29,19 @@ export default class Input extends LightningElement {
         );
         console.log(this.textValueInternal);
     }
-
+    handleOnInput(event) {
+        const lineNum = event.target.value;
+        if (!isNaN(lineNum) && lineNum !== '') {
+            clearTimeout(this.timeoutId);
+            this.timeoutId = setTimeout(() => {
+                this.dispatchEvent(
+                    new CustomEvent('inputchange', {
+                        detail: parseInt(lineNum, 10)
+                    })
+                );
+            }, 500);
+        }
+    }
     checkMinLength() {
         if (this.minimumLength && this.textValueInternal) {
             if (
diff --git a/src/modules/ui/search/search.js b/src/modules/ui/search/search.js
index 0d93f94..6e78481 100644
--- a/src/modules/ui/search/search.js
+++ b/src/modules/ui/search/search.js
@@ -5,7 +5,7 @@ export default class Search extends LightningElement {
     onRes = 0;
     totRes = 0;
     nextDisabled = false;
-    prevDisabled = true;
+    prevDisabled = false;
     matchedLines = [];
     @api logtobeFiltered = [];
 
@@ -21,35 +21,56 @@ export default class Search extends LightningElement {
     handleSearchInput(event) {
         clearTimeout(this.timeoutId);
         const input = event.target.value;
+        console.log('entered: ', input);
         this.timeoutId = setTimeout(() => {
             this.searchLog(input);
         }, 500);
-        console.log('input: ', event.target.value);
+        //    console.log('input: ', event.target.value);
     }
 
     gotoNext() {
+        let idx = this.onRes - 1;
         if (this.onRes < this.totRes) {
+            this.onRes++;
             this.dispatchEvent(
-                new CustomEvent('nextmatch', {
-                    detail: this.matchedLines[this.onRes++]
+                new CustomEvent('matchchange', {
+                    detail: this.matchedLines[++idx]
                 })
             );
+        } else if (this.onRes === this.totRes) {
+            if (this.totRes !== 0) {
+                this.onRes = 1;
+                this.dispatchEvent(
+                    new CustomEvent('matchchange', {
+                        detail: this.matchedLines[0]
+                    })
+                );
+            }
         }
 
-        this.nextDisabled = this.onRes === this.totRes ? true : false;
-        this.prevDisabled = this.onRes === 0 ? true : false;
+        //    this.nextDisabled = this.onRes === this.totRes ? true : false;
+        //    this.prevDisabled = this.onRes === 0 ? true : false;
     }
 
     goBack() {
-        if (this.onRes > 0) {
+        let idx = this.onRes - 1;
+        if (idx > 0) {
+            this.onRes--;
             this.dispatchEvent(
-                new CustomEvent('prevmatch', {
-                    detail: this.matchedLines[this.onRes--]
+                new CustomEvent('matchchange', {
+                    detail: this.matchedLines[--idx]
+                })
+            );
+        } else if (idx === 0) {
+            this.onRes = this.totRes;
+            this.dispatchEvent(
+                new CustomEvent('matchchange', {
+                    detail: this.matchedLines[this.onRes - 1]
                 })
             );
         }
-        this.nextDisabled = this.onRes === this.totRes ? true : false;
-        this.prevDisabled = this.onRes === 0 ? true : false;
+        //    this.nextDisabled = this.onRes === this.totRes ? true : false;
+        //    this.prevDisabled = this.onRes === 0 ? true : false;
     }
 
     searchLog(searchTerm) {
@@ -57,7 +78,7 @@ export default class Search extends LightningElement {
             this.onRes = this.totRes = 0;
             return;
         }
-        if (searchTerm.length !== 0 && searchTerm !== undefined) {
+        if (searchTerm.length >= 2 && searchTerm !== undefined) {
             const results = this.logtobeFiltered.filter((log) =>
                 log.line.includes(searchTerm)
             );
@@ -66,20 +87,27 @@ export default class Search extends LightningElement {
                 //  console.log('Found logs:', results);
                 this.matchedLines = results.map((log) => log.lineNumber);
                 this.totRes = this.matchedLines.length;
-
+                this.onRes = 1;
+                this.dispatchEvent(
+                    new CustomEvent('searchres', {
+                        detail: this.matchedLines
+                    })
+                );
                 this.dispatchEvent(
-                    new CustomEvent('nextmatch', {
-                        detail: this.matchedLines[this.onRes++]
+                    new CustomEvent('matchchange', {
+                        detail: this.matchedLines[this.onRes - 1]
                     })
                 );
                 //  console.log('Line numbers:', lineNumbers);
             } else if (results.length === 0) {
                 this.onRes = 0;
                 this.totRes = 0;
+                this.dispatchEvent(new CustomEvent('nores'));
             }
         } else {
             this.onRes = 0;
             this.totRes = 0;
+            this.dispatchEvent(new CustomEvent('nores'));
         }
     }
 }