update with activity log layout and function
Merge branch 'devBrian'