Updated window layout to be much more editable