Made an base class and got all drawing well, added links to window frame model
Remove dead commented code.
Moved icon to common area and fixed all references.