reorganising

trying to stop double inject on button
added a rescan button but doesnt work either