More tweaks to order and alignment