Tweaked layout menu order.