changed templates

improved website flow