Adjusting progress window layout
General code cleanup