Corrected Window Sizing + Misc Fixes