add x_org logic to handle_shelf