Fixed find button refresh bug
Fixing merge conflict
Cleaned up some code