Fixed bugs from merge and increase size of the window