Initial change for window title issue. 

If this resolves it, it will be implemented for all other occurances.