* commit for #27 and #28 * updated layout