Some tweaks in window size parameters after maximizing; Some cleanup;