Change window dimension and texts z order
Fix conflict