Cleaned up ui for search