Window added and structural changes
Code design