master: conceding on lame layout for now