Refactoring
Scan view and fixes