Changes for the view templates