nandseewindow: Move some things around