changes to include routing and template fix