Main Window reworked