Added routing and split template up