organize templates, small ui fixes