Modified templates and added strings for non-administrative views