[aphrodite] New layout