Refactoring Programwindows
Moved to group by section (TKP) w/lynn