Redesign main window layout to use grid system