WIP: added initial layout format