Beginning to clean up css
Fixed merge conflicts
Modified the event boxes, so that they don't stretch to odd proportions. Added a max-width