[#870] Final tweaks to CSS and templates