modifications for media.html and events.html
resolved merg conflicts in custom.css