template updates plus integrating django activity stream