Tweaks to HTML and some DB fixes.