Fixed theming and some more html_safe strings