Logic for UserWindow added
Conflicts resolved