Added rescan controls and button, Issue #38