added a class for making windows and menus
fixed merge errors