Added loading template
Router changes