After consultation at thursday
Merge branch 'usb-stick/master'
Moved listners to outer
Redused main window size