Prepared the layout code in preparation for #10, still waiting for assemble
fixed #2