Add search. Minor gem updates and markup changes