Changed window layout, and formatting