simplify layout, edit typos