improve layout, term suggestion