Added activity view and template view