Further reworking on layout with Teacup.