Windowing update but still bugs remain