Removed space boarders and expansion of grid with window.