Looks like a subset of my suggested changes got put in but not all of them leaving things in a mess. Pull request here with suggested fixes demonstrated in the attachments below.
https://github.com/elkarte/Elkarte/pull/1531
The xxx.jpg files are the current master, the xxx2.jpg are with the pull request.