I think the game saves the window layout separately in each mode.
Best bet would be to goto the mode that the windows are not in the right location, move them to where they should be, and then zone or log out/in, keeping the mode the same. At least that's my best guess
