Refactored client side to begin search UI