Updated templates
Added loading  text.