Better search row layout; fix wonky scroll bar