small changes to order and layout