Fixing various bugs, modifying window design.