Revise the main window design