Added search field and layout stuff