Progress on some layout magic :sunglasses: