Added window and menus