Windows Paint Tree Layout Update

as well as some other updates