Fixed opening in new window
More new window fixes