Merge issues rectified + Hide loading widget on new scan