Hack: switched to use of JS templates instead of simply HTML