added new count and session buttons when viewing an activity, fixed margin padding
resolved merge conflict