Last tweaks for the window