more templates and ui fixes