window 2 content added
merged conflict from window gui