fix for activity restructure
Merge pull request #1518 from yashodha/activity-restructure-fixes

fix for activity restructure