moved some more stuff into the window view model, some renames