Variable window layout improvements