bugfixes

* scan - merge form - fix for integrity error
* better HD detection
* scan - merge form - fix for disks section
* other...