Removed unnecessary and commented out code
Improved window widgets positioning and behavior