Make "showMore" optional and refactor UI