Main Window reorganized