re-organized windows