adding the sub windows and correction on some classes