Templating and second pass popup-info design
Version bump 1.8.5