Fix #9, add word breaks, new entry layout.