Activity page Changes
Solved Story board conflicts