Improved Window Links
Update, Conflicts Solved