Fixes both issues in #880; styling issue due to missing </div> closing tag.