UX improvements, templates refactoring