added expiration timer to deployment detail page, reorganized templates