Fixed bugs duo to maximized window
merged conflicts