better templating and styling for #2099