Added searchable fields
Moved download buttons to top