added some formatting with bootstrap
added some formatting to events
merged some changes and added some formatting