rearranged UI and added enter-keypress-event for enhanced searching