WE layout improvements