added Tag adding deleting; small template changes