Added keyword search, fixed text wrapping issues