update layout, fix typos