minor fixes + create layout