Change window ID
Prepare for easier building