improve device detection, rename the main window
Merge branch 'm25'