Changed to main window and added menu