Tweaked windows and fixed a few bugs