Use dynamic templates instead of directives for steps
Move templates to templates folder
Fix the results page