fixed css for ubttons on search pages
fixed merge conflict
merged with updated master
Merge pull request #89 from tararoys/cjo_overlay_fix

Cjo overlay fix