Made changes in CSS, Text, Formatting , Event pages
merged conflict