Changing window size
Fixing conflicts