Merging with the master
Added logic for searching the fields
merged changes
clean up
ui updates
Merge branch 'patelsan-master'