windows placement fixes/cleaning up